Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-01-09 | 1 | -8/+17 |
|\ | |||||
| * | bugfix: some property-based filter were incorrectly parsed | Rainer Gerhards | 2013-01-09 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This usually lead to a syntax error on startup and rsyslogd not actually starting up. The problem was the regex, which did not care for double quote characters to follow in the action part - unfortunately something that can frequently happen with v6+ format. An example: :programname, isequal, "as" {action(type="omfile" ...) } Here, the part :programname, isequal, "as" {action(type="omfile" was treated as the property filter, and the rest as action part. Obviously, this did not work out. Unfortunately, such situations usually resulted in very hard to understand error messages. | ||||
| * | improve config reader error messages a bit more | Rainer Gerhards | 2013-01-09 | 1 | -6/+12 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-01-09 | 1 | -1/+2 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | slightly improved config parser error messages when invalid escapes happen | Rainer Gerhards | 2013-01-09 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-01-08 | 1 | -5/+5 |
|\| | |||||
| * | bugfix: doGetFileCreateMode() had invalid validity check ;) | Chandler Latour | 2013-01-08 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-12-18 | 1 | -0/+4 |
|\| | |||||
| * | cosmetic: silence compiler warning | Rainer Gerhards | 2012-12-18 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'master-optimize-facilitext' | Rainer Gerhards | 2012-12-14 | 1 | -14/+354 |
|\ \ | |||||
| * | | script optimizer: support textual severities in compare operations as well | Rainer Gerhards | 2012-12-11 | 1 | -0/+17 |
| | | | |||||
| * | | script optimizer: support numerical facilities in compare operations as well | Rainer Gerhards | 2012-12-11 | 1 | -5/+58 |
| | | | |||||
| * | | script optimizer: severity lt/le/gt/ge to prifilt() | Rainer Gerhards | 2012-12-11 | 1 | -16/+46 |
| | | | |||||
| * | | script optimizer: severity eq/ne to prifilt() | Rainer Gerhards | 2012-12-11 | 1 | -5/+37 |
| | | | |||||
| * | | bugfix: optimizer stopped prematurely on some operations | Rainer Gerhards | 2012-12-11 | 1 | -0/+11 |
| | | | |||||
| * | | script optimizer: optimize and/or on PRI filters | Rainer Gerhards | 2012-12-11 | 1 | -0/+37 |
| | | | |||||
| * | | script optimizer: support NOT pri matches | Rainer Gerhards | 2012-12-11 | 1 | -4/+42 |
| | | | |||||
| * | | enhance optimizer: detect eq-comparison for syslog facility | Rainer Gerhards | 2012-12-11 | 1 | -9/+131 |
| | | | | | | | | | | | | ... and replace it with a (much faster) prifilt() call | ||||
* | | | Merge branch 'v7-stable-newmsglock' into master-newmsglock | Rainer Gerhards | 2012-12-06 | 2 | -0/+25 |
|\ \ \ | |/ / |/| / | |/ | | | | | | | Conflicts: runtime/msg.c runtime/queue.c tools/syslogd.c | ||||
| * | fix missing functionality: ruleset(){} could not specify ruleset queue | Rainer Gerhards | 2012-11-30 | 2 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | The "queue.xxx" parameter set was not supported, and legacy ruleset config statements did not work (by intention). The fix introduces the "queue.xxx" parameter set. It has some regression potential, but only for the new functionality. Note that using that interface it is possible to specify duplicate queue file names, which will cause trouble. This will be solved in v7.3, because there is a too-large regression potential for the v7.2 stable branch. | ||||
* | | cleanup | Rainer Gerhards | 2012-11-30 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-28 | 1 | -2/+4 |
|\| | | | | | | | | | | | | | Conflicts: doc/imptcp.html plugins/mmjsonparse/mmjsonparse.c plugins/mmnormalize/mmnormalize.c | ||||
| * | silence some primarily cosmetic compiler warning messages | Rainer Gerhards | 2012-11-28 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-22 | 2 | -7/+12 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/bsd.c plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| * | improve $IncludeConfig error messages | Rainer Gerhards | 2012-11-20 | 1 | -4/+7 |
| | | |||||
| * | regression fix: rsyslog terminated when wild-card $includeFile did not find ↵ | Rainer Gerhards | 2012-11-20 | 1 | -2/+5 |
| | | | | | | | | | | | | files Unfortunately, this is often the case by default in many distros. | ||||
| * | cleanup | Rainer Gerhards | 2012-11-20 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-14 | 1 | -5/+17 |
|\| | |||||
| * | 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 'v7-stable' | Rainer Gerhards | 2012-11-09 | 1 | -17/+19 |
|\| | |||||
| * | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-09 | 1 | -16/+18 |
| |\ | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | * | bugfix: $IncludeConfig did not correctly process directories | Rainer Gerhards | 2012-11-09 | 1 | -18/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | |\ | |||||
| * | \ | Merge branch 'v7.2.1-bugfix' into v7-stable | Rainer Gerhards | 2012-11-09 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | bugfix: potential segfault due to invalid param handling in comparisons | Rainer Gerhards | 2012-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-02 | 1 | -1/+0 |
|\| | | | | |||||
| * | | | | bugfix: potential segfault when re_match() function was used | oxpa | 2012-11-02 | 1 | -1/+0 |
| |/ / / | | | | | | | | | | | | | | | | | Thanks to oxpa for the patch. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=371 | ||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-29 | 1 | -1/+1 |
|\| | | | |||||
| * | | | bugfix: ruleset()-object did only support a single statement | Rainer Gerhards | 2012-10-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-24 | 1 | -1/+1 |
|\| | | | |||||
| * | | | cleanup | Rainer Gerhards | 2012-10-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | permit action-like statements (stop, call, ...) in action lists | Rainer Gerhards | 2012-10-22 | 1 | -3/+4 |
|/ / / | |||||
* | | | fix regression introduced by last commit | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | action object was created twice, resulting in memleak | ||||
* | | | bugfixes in regards to action() | Rainer Gerhards | 2012-10-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | - bugfix: small memory leak when processing action() statements - bugfix: unknown action() parameters were not reported | ||||
* | | | bugfix: some config processing warning messages were treated as errors | Rainer Gerhards | 2012-10-11 | 1 | -2/+6 |
| | | | |||||
* | | | add missing prototype | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | |||||
* | | | bugfix: in (non)equal comparisons the position of arrays influenced result | Rainer Gerhards | 2012-10-09 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | This behaviour is OK for "contains"-type of comparisons (which have quite different semantics), but not for == and <>, which shall be commutative. This has been fixed now, so there is no difference any longer if the constant string array is the left or right hand operand. We solved this via the optimizer, as it keeps the actual script execution code small. | ||||
* | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | bugfix: comments inside objects (e.g. action()) were not properly handled | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | | |