summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make sure inaccessible config file is not tried to be processedRainer Gerhards2012-11-141-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 nothingGeorgi Georgiev2012-11-131-4/+16
| | | | This will avoid an error message when including an empty directory.
* Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-132-1/+5
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-132-1/+5
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * add "EAGAIN" patch to ChangeLogRainer Gerhards2012-11-131-0/+4
| | |
| | * imuxsock: do not log EAGAIN in nonblocking recvfromMarius Tomaschewski2012-11-131-1/+1
| | |
* | | doc: upgrade ruleset doc to v7 config systemKonstantin Schmitt2012-11-123-98/+227
| | |
* | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-0911-18/+90
|\| | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | bugfix: $IncludeConfig did not correctly process directoriesRainer Gerhards2012-11-0911-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 settingRainer Gerhards2012-11-091-21/+0
| | |
* | | cleanupRainer Gerhards2012-11-091-7/+7
| | |
* | | Merge branch 'v7.2.1-bugfix' into v7-stableRainer Gerhards2012-11-092-1/+8
|\ \ \
| * | | bugfix: potential segfault due to invalid param handling in comparisonsRainer Gerhards2012-11-082-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 functionalityRainer Gerhards2012-11-094-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 documentedRainer Gerhards2012-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | The doc contained a previous default, which has been changed in the mean time.
* | | | doc: mention imported patch in ChangeLogRainer Gerhards2012-11-081-0/+1
| | | |
* | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-082-1/+3
|\ \ \ \ | | |/ / | |/| |
| * | | bugfix: no error msg on invalid field option in legacy/string templateRainer Gerhards2012-11-082-1/+3
| | | |
* | | | bugfixes in string-type template()SRainer Gerhards2012-11-082-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 Bartos2012-11-051-2/+4
| | | |
* | | | bugfix: potential abort of imtcp on rsyslogd shutdownRainer Gerhards2012-11-022-3/+4
| | | |
* | | | bugfix: potential segfault when re_match() function was usedoxpa2012-11-022-1/+3
| | | | | | | | | | | | | | | | | | | | Thanks to oxpa for the patch. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=371
* | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-0111-10/+13
|\| | |
| * | | doc: add recent patch (API) to ChangeLogRainer Gerhards2012-11-011-0/+3
| | | |
| * | | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-0110-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-stableRainer Gerhards2012-11-012-1/+8
|\| | |
| * | | bugfix: misaddressing of $mmnormalizeuserawmsg parameterRainer Gerhards2012-11-012-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 platformsRainer Gerhards2012-10-262-1/+4
| | | |
* | | | bugfix: imzmq3 segfault with PULL subscriptionMartin Nilsson2012-10-302-3/+7
| | | |
* | | | bugfix: omfwd did not properly support "template" parameterRainer Gerhards2012-10-307-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 machinesRainer Gerhards2012-10-292-0/+6
| |/ / |/| | | | | | | | ... due to too small timeout for enqueue processing --> messages got lost
* | | prepare for 7.2.1 releasev7.2.1Rainer Gerhards2012-10-293-3/+3
| | |
* | | testbench: add test for ruleset() and call statementsRainer Gerhards2012-10-293-0/+38
| | |
* | | bugfix: ruleset()-object did only support a single statementRainer Gerhards2012-10-272-1/+2
| | |
* | | add -D rsyslogd option to enable config parser debug modeRainer Gerhards2012-10-273-1/+14
| | |
* | | Improve syntax error messages by outputting the error tokenRainer Gerhards2012-10-272-1/+3
| | |
* | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-251-2/+1
|\| |
| * | doc: fix html formattingMichael Biebl2012-10-251-2/+1
| | |
* | | cleanupRainer Gerhards2012-10-242-3/+1
| | |
* | | make rsyslog core suspened actions after 10 failures in a rowRainer Gerhards2012-10-243-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 syslogRainer Gerhards2012-10-242-13/+22
| | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366
* | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-222-5/+11
|\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c
| * | preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-225-7/+10
| | |
| * | Merge branch 'v6-beta' into v6-stableRainer Gerhards2012-10-2288-935/+7279
| |\ \
| | * \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-4/+4
| | |\ \
| | * | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-0/+3
| | | | |
| | * | | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-5/+1
| | |\ \ \
| | * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-176-45/+22
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-162-9/+11
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-112-1/+7
| | |\ \ \ \ \ \