Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | make sure inaccessible config file is not tried to be processed | Rainer Gerhards | 2012-11-14 | 1 | -3/+3 |
| | | | | | | | The processing loop was not terminated when an unaccessible file was detected, and so processing was done using unitialized data, which could lead to all sorts of problems. Also did some minor cleanup. | ||||
* | Silently ignore wildcard includes that match nothing | Georgi Georgiev | 2012-11-13 | 1 | -4/+16 |
| | | | | This will avoid an error message when including an empty directory. | ||||
* | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-13 | 2 | -1/+5 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-13 | 2 | -1/+5 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | add "EAGAIN" patch to ChangeLog | Rainer Gerhards | 2012-11-13 | 1 | -0/+4 |
| | | | |||||
| | * | imuxsock: do not log EAGAIN in nonblocking recvfrom | Marius Tomaschewski | 2012-11-13 | 1 | -1/+1 |
| | | | |||||
* | | | doc: upgrade ruleset doc to v7 config system | Konstantin Schmitt | 2012-11-12 | 3 | -98/+227 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-09 | 11 | -18/+90 |
|\| | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| * | | bugfix: $IncludeConfig did not correctly process directories | Rainer Gerhards | 2012-11-09 | 11 | -20/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=376 The testbench was also enhanced to check for these cases. Thanks to Georgi Georgiev for the bug report. Also minor bugfix: no error msg on unreadable $IncludeConfig path | ||||
* | | | cleanup: remove no longer needed configure setting | Rainer Gerhards | 2012-11-09 | 1 | -21/+0 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2012-11-09 | 1 | -7/+7 |
| | | | |||||
* | | | Merge branch 'v7.2.1-bugfix' into v7-stable | Rainer Gerhards | 2012-11-09 | 2 | -1/+8 |
|\ \ \ | |||||
| * | | | bugfix: potential segfault due to invalid param handling in comparisons | Rainer Gerhards | 2012-11-08 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen in RainerScript comparisons (like contains); in some cases an unitialized variable was accessed, which could lead to an invalid free and in turn to a segfault. Closes: http://bugzilla.adiscon.com/show_bug.cgi?id=372 Thanks to Georgi Georgiev for reporting this bug and his great help in solving it. | ||||
* | | | | enabled to build without libuuid, at loss of uuid functionality | Rainer Gerhards | 2012-11-09 | 4 | -2/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | this enables smoother builds on older systems that do not support libuuid. Loss of functionality should usually not matter too much as uuid support has only recently been added and is very seldom used. | ||||
* | | | | doc: $ActionQueueDiscardSeverity had wrong default documented | Rainer Gerhards | 2012-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | The doc contained a previous default, which has been changed in the mean time. | ||||
* | | | | doc: mention imported patch in ChangeLog | Rainer Gerhards | 2012-11-08 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-08 | 2 | -1/+3 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | bugfix: no error msg on invalid field option in legacy/string template | Rainer Gerhards | 2012-11-08 | 2 | -1/+3 |
| | | | | |||||
* | | | | bugfixes in string-type template()S | Rainer Gerhards | 2012-11-08 | 2 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both are closely related and thus rolled into a single commit. - bugfix: improper handling of backslash in string-type template()s - bugfix: leading quote (") in string-type template() lead to thight loop on startup | ||||
* | | | | Added imkmsg^imklog to imkmsg documentation. | Milan Bartos | 2012-11-05 | 1 | -2/+4 |
| | | | | |||||
* | | | | bugfix: potential abort of imtcp on rsyslogd shutdown | Rainer Gerhards | 2012-11-02 | 2 | -3/+4 |
| | | | | |||||
* | | | | bugfix: potential segfault when re_match() function was used | oxpa | 2012-11-02 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Thanks to oxpa for the patch. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=371 | ||||
* | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 11 | -10/+13 |
|\| | | | |||||
| * | | | doc: add recent patch (API) to ChangeLog | Rainer Gerhards | 2012-11-01 | 1 | -0/+3 |
| | | | | |||||
| * | | | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 10 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used. | ||||
* | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 2 | -1/+8 |
|\| | | | |||||
| * | | | bugfix: misaddressing of $mmnormalizeuserawmsg parameter | Rainer Gerhards | 2012-11-01 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | On many platforms, this has no effect at all. At some, it may cause a segfault. The problem occurs only during config phase, no segfault happens when rsyslog has fully started. | ||||
| * | | | bugfix: build problems on some platforms | Rainer Gerhards | 2012-10-26 | 2 | -1/+4 |
| | | | | |||||
* | | | | bugfix: imzmq3 segfault with PULL subscription | Martin Nilsson | 2012-10-30 | 2 | -3/+7 |
| | | | | |||||
* | | | | bugfix: omfwd did not properly support "template" parameter | Rainer Gerhards | 2012-10-30 | 7 | -3/+110 |
| | | | | | | | | | | | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools. | ||||
* | | | | testbench: complex1.sh testcase failed on slower machines | Rainer Gerhards | 2012-10-29 | 2 | -0/+6 |
| |/ / |/| | | | | | | | | ... due to too small timeout for enqueue processing --> messages got lost | ||||
* | | | prepare for 7.2.1 releasev7.2.1 | Rainer Gerhards | 2012-10-29 | 3 | -3/+3 |
| | | | |||||
* | | | testbench: add test for ruleset() and call statements | Rainer Gerhards | 2012-10-29 | 3 | -0/+38 |
| | | | |||||
* | | | bugfix: ruleset()-object did only support a single statement | Rainer Gerhards | 2012-10-27 | 2 | -1/+2 |
| | | | |||||
* | | | add -D rsyslogd option to enable config parser debug mode | Rainer Gerhards | 2012-10-27 | 3 | -1/+14 |
| | | | |||||
* | | | Improve syntax error messages by outputting the error token | Rainer Gerhards | 2012-10-27 | 2 | -1/+3 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-25 | 1 | -2/+1 |
|\| | | |||||
| * | | doc: fix html formatting | Michael Biebl | 2012-10-25 | 1 | -2/+1 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2012-10-24 | 2 | -3/+1 |
| | | | |||||
* | | | make rsyslog core suspened actions after 10 failures in a row | Rainer Gerhards | 2012-10-24 | 3 | -1/+15 |
| | | | | | | | | | | | | | | | This was former the case after 1,000 failures and could cause rsyslog to be spammed/ressou | ||||
* | | | ommongodb rate-limits error messages to prevent spamming the syslog | Rainer Gerhards | 2012-10-24 | 2 | -13/+22 |
| | | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366 | ||||
* | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-22 | 2 | -5/+11 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c | ||||
| * | | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 5 | -7/+10 |
| | | | |||||
| * | | Merge branch 'v6-beta' into v6-stable | Rainer Gerhards | 2012-10-22 | 88 | -935/+7279 |
| |\ \ | |||||
| | * \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| | |\ \ | |||||
| | * | | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 6 | -45/+22 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 2 | -9/+11 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 |
| | |\ \ \ \ \ \ |