Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-13 | 5 | -99/+232 |
|\ | |||||
| * | 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 'v7-stable' | Rainer Gerhards | 2012-11-09 | 14 | -42/+134 |
|\| | | | |||||
| * | | | 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. | ||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-08 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | 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 patches in ChangeLog | Rainer Gerhards | 2012-11-08 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-08 | 3 | -8/+21 |
|\| | | | | |||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | prepare for 7.3.3 releasev7.3.3 | Rainer Gerhards | 2012-11-07 | 3 | -5/+8 |
| | | | | | |||||
* | | | | | bugfix: property tTIMESTAMP was incorrectly restored | Rainer Gerhards | 2012-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | in msg deserializer | ||||
* | | | | | cleanup: remove no longer needed function | Rainer Gerhards | 2012-11-06 | 2 | -87/+0 |
| | | | | | |||||
* | | | | | queue: reduce CPU load for deserializing message properties | Rainer Gerhards | 2012-11-06 | 6 | -23/+226 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Linear runtime due to message order. Was quadratic before. However, not a big overall improvement. | ||||
* | | | | | doc: improve ommongodb doc | Rainer Gerhards | 2012-11-06 | 2 | -0/+61 |
| | | | | | |||||
* | | | | | queue: mini-improvement in deserializer (stage work) | Rainer Gerhards | 2012-11-05 | 3 | -5/+5 |
| | | | | | |||||
* | | | | | very minimal improvement in reconstructing persisted queue entries | Rainer Gerhards | 2012-11-05 | 1 | -6/+4 |
| | | | | | |||||
* | | | | | improve debug logging a bit | Rainer Gerhards | 2012-11-05 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | bugfix: dynafile zip files could be corrupted | Rainer Gerhards | 2012-11-05 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen if a dynafile was destructed before the first write. In practice, this could happen if few lines were written to a file and it then became evicted from the dynafile cache. This would probably look very random, because it depended on the timing in regard to message volume and dynafile cache size. | ||||
* | | | | | queue: handle unknown queue type in debug output | Rainer Gerhards | 2012-11-03 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | note: can not happen, but... | ||||
* | | | | | Merge branch 'master-newqueue' | Rainer Gerhards | 2012-11-03 | 13 | -139/+201 |
|\ \ \ \ \ | |||||
| * | | | | | queue: remove time() calls from msg deserialization | Rainer Gerhards | 2012-11-03 | 4 | -5/+30 |
| | | | | | | |||||
| * | | | | | queue: use specific deserializer for msg object | Rainer Gerhards | 2012-11-03 | 5 | -10/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | spares lengthy table lookups | ||||
| * | | | | | queue: remove unnecessary (obj_t*) redirection from msg ptrs | Rainer Gerhards | 2012-11-03 | 4 | -49/+44 |
| | | | | | | |||||
| * | | | | | cosmetic: remove compiler warning | Rainer Gerhards | 2012-11-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | queue: change generic msg ptr (pUsr) to be of msg_t type | Rainer Gerhards | 2012-11-03 | 6 | -73/+55 |
| | | | | | | |||||
| * | | | | | queue: change gerenic queue pUsr ptr to be action_t | Rainer Gerhards | 2012-11-03 | 5 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was always action_t, but the initial design was more generic. We are making it specific now in order to gain better performance (after all, we did not need the generic engine in the past 8 years...) | ||||
| * | | | | | generate disk .qi file once at queue construction | Rainer Gerhards | 2012-11-02 | 2 | -16/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... instead of each time a file write happens. In some situations (very frequent sync), this can probably be a big performane win. | ||||
* | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-02 | 3 | -4/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | 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 'v7-stable' | Rainer Gerhards | 2012-11-01 | 1 | -0/+3 |
|\| | | | | |||||
| * | | | | 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 'v7-stable' | Rainer Gerhards | 2012-11-01 | 3 | -4/+15 |
|\| | | | | |||||
| * | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 2 | -1/+8 |
| |\| | | |