Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: typo fix | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | |||||
* | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 |
|\ | | | | | | | | | Conflicts: rsyslog.service.in | ||||
| * | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 |
| | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions | ||||
* | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 1 | -1/+7 |
| | | |||||
* | | fix double-free | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | |||||
* | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | |||||
* | | cosmetic cleanup | Rainer Gerhards | 2012-10-09 | 1 | -3/+1 |
| | | |||||
* | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -2/+1 |
|\| | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | ||||
| * | build: don't include librsyslog.la in the dist tarball | Michael Biebl | 2012-10-04 | 1 | -2/+1 |
| | | | | | | | | libtool archives are not meant to be shipped in the source tarball. | ||||
| * | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 2 | -0/+468 |
|\ \ | |||||
| * | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 2 | -456/+468 |
| | | | |||||
| * | | add new tool "logctl" to access lumberjack logs in MongoDB | Ulrike Gerhards | 2012-10-02 | 1 | -0/+456 |
| | | | |||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
|\| | | |||||
| * | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | |||||
* | | | bugfix: omfile action did not respect "template" parameter | Rainer Gerhards | 2012-09-19 | 1 | -1/+3 |
| | | | | | | | | | | | | ... and used default template in all cases | ||||
* | | | correct library link order | Rainer Gerhards | 2012-09-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Thanks to Evgeny Turnaev for alerting us on the problem and providing hits to the solution. | ||||
* | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-06 | 2 | -1/+11 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/rsconf.c | ||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 2 | -1/+11 |
| |\| | |||||
| | * | Fixed TCP CheckConnection handling in omfwd.c. | Andre Lorbach | 2012-08-25 | 1 | -1/+10 |
| | | | | | | | | | | | | Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly. | ||||
| | * | bugfix: omusrsmsg incorrect return state & config warning handling | Rainer Gerhards | 2012-08-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug. | ||||
| | * | cleanup: remove left-over commented-out code | Rainer Gerhards | 2012-08-25 | 1 | -10/+0 |
| | | | |||||
* | | | new ruleengine: some cleanup | Rainer Gerhards | 2012-09-06 | 1 | -5/+0 |
|/ / | |||||
* | | add uuid property to message object | Jérôme Renard | 2012-08-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 2 | -25/+72 |
|\| | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 2 | -22/+71 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c | ||||
| | * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 1 | -4/+59 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c | ||||
| | | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 1 | -1/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog. | ||||
| | * | | changed TRUE/FALSE to RSTRUE/RSFALSE | Rainer Gerhards | 2012-08-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | This is done to prevent name claches with libraries. | ||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-15 | 1 | -0/+1 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 1 | -3/+19 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | bugfix: potential abort if output plugin logged message during shutdown | Rainer Gerhards | 2012-08-01 | 1 | -3/+19 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347 | ||||
| | * | | bugfix "$PreserveFQDN on" was not honored in some modules | Rainer Gerhards | 2012-06-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. --------------------------------------------- | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | omelasticsearch: added transactional interface & better debug output | Rainer Gerhards | 2012-05-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | ompipe: fix copy&paste name errors | Rainer Gerhards | 2012-06-25 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | omfwd: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -8/+127 |
| | | | | | |||||
* | | | | | ompipe: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -5/+97 |
| | | | | | |||||
* | | | | | a bit more cleanup | Rainer Gerhards | 2012-06-25 | 1 | -5/+2 |
| | | | | | |||||
* | | | | | cleanup & fix of mini-leak | Rainer Gerhards | 2012-06-25 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | implemented freeCnf() module interface & fixed some mem leaks | Rainer Gerhards | 2012-06-25 | 2 | -27/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable. | ||||
* | | | | | milestone: module() config statement basically works | Rainer Gerhards | 2012-06-21 | 1 | -11/+131 |
| | | | | | | | | | | | | | | | | | | | | some nits to iron out, only omfile actually support module params | ||||
* | | | | | bump default omfile iobuffer size to 4k | Rainer Gerhards | 2012-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | (should originally have this value; larger value makes limited sense giving current batch sizes) | ||||
* | | | | | milestone: regex is compiled from script based filter | Rainer Gerhards | 2012-06-12 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-06 | 1 | -0/+5 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-06 | 1 | -0/+5 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: runtime/modules.c | ||||
| | * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-06 | 1 | -0/+5 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c | ||||
| | | * | | add small delay (50ms) after sending shutdown message | Rainer Gerhards | 2012-06-04 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seem to be cases where the shutdown message is otherwise not processed, not even on an idle system. Thanks to Marcin for bringing this problem up. | ||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-01 | 1 | -2/+2 |
|\| | | | |