summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v7-stable'Rainer Gerhards2012-11-135-99/+232
|\
| * 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 'v7-stable'Rainer Gerhards2012-11-0914-42/+134
|\| | |
| * | | 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.
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-081-1/+1
|\| | | |
| * | | | 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 patches in ChangeLogRainer Gerhards2012-11-081-0/+6
| | | | |
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-083-8/+21
|\| | | |
| * | | | 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
| | | | |
* | | | | prepare for 7.3.3 releasev7.3.3Rainer Gerhards2012-11-073-5/+8
| | | | |
* | | | | bugfix: property tTIMESTAMP was incorrectly restoredRainer Gerhards2012-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | in msg deserializer
* | | | | cleanup: remove no longer needed functionRainer Gerhards2012-11-062-87/+0
| | | | |
* | | | | queue: reduce CPU load for deserializing message propertiesRainer Gerhards2012-11-066-23/+226
| | | | | | | | | | | | | | | | | | | | | | | | | Linear runtime due to message order. Was quadratic before. However, not a big overall improvement.
* | | | | doc: improve ommongodb docRainer Gerhards2012-11-062-0/+61
| | | | |
* | | | | queue: mini-improvement in deserializer (stage work)Rainer Gerhards2012-11-053-5/+5
| | | | |
* | | | | very minimal improvement in reconstructing persisted queue entriesRainer Gerhards2012-11-051-6/+4
| | | | |
* | | | | improve debug logging a bitRainer Gerhards2012-11-051-4/+3
| | | | |
* | | | | bugfix: dynafile zip files could be corruptedRainer Gerhards2012-11-052-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 outputRainer Gerhards2012-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | note: can not happen, but...
* | | | | Merge branch 'master-newqueue'Rainer Gerhards2012-11-0313-139/+201
|\ \ \ \ \
| * | | | | queue: remove time() calls from msg deserializationRainer Gerhards2012-11-034-5/+30
| | | | | |
| * | | | | queue: use specific deserializer for msg objectRainer Gerhards2012-11-035-10/+73
| | | | | | | | | | | | | | | | | | | | | | | | spares lengthy table lookups
| * | | | | queue: remove unnecessary (obj_t*) redirection from msg ptrsRainer Gerhards2012-11-034-49/+44
| | | | | |
| * | | | | cosmetic: remove compiler warningRainer Gerhards2012-11-031-1/+1
| | | | | |
| * | | | | queue: change generic msg ptr (pUsr) to be of msg_t typeRainer Gerhards2012-11-036-73/+55
| | | | | |
| * | | | | queue: change gerenic queue pUsr ptr to be action_tRainer Gerhards2012-11-035-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 constructionRainer Gerhards2012-11-022-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 Gerhards2012-11-023-4/+7
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | 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 'v7-stable'Rainer Gerhards2012-11-011-0/+3
|\| | | |
| * | | | 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 'v7-stable'Rainer Gerhards2012-11-013-4/+15
|\| | | |
| * | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-012-1/+8
| |\| | |