summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into betaRainer Gerhards2012-07-242-9/+9
|\
| * bugfix: strm class could abort under some circumstancesRainer Gerhards2012-07-241-6/+4
| | | | | | | | | | ... it could pass a NULL pointer to unlink. Depending on OS implementation, this could (or could not...) lead to a segfault.
| * bugfix: DA queue could cause abortRainer Gerhards2012-07-241-3/+5
| | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked.
* | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-091-2/+0
| |
* | debug log: cleaned up & streamlined queue param outputRainer Gerhards2012-07-051-20/+43
| |
* | debug log: emit (some) action queue parameters to debug logRainer Gerhards2012-07-052-0/+27
| |
* | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-293-2/+3
|\ \
| * | property replacer lost one char when json escaping was necessaryRainer Gerhards2012-05-211-1/+1
| | | | | | | | | | | | The character immediately in front of the first escape was lost.
| * | omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-251-0/+1
| | |
| * | Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-2312-159/+438
| |\ \ | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c
| * | | permitting plugins to use three string requestsRainer Gerhards2012-04-132-4/+8
| | | |
| * | | omelasticsearch: used new property replacer options for default templateRainer Gerhards2012-04-051-1/+1
| | | | | | | | | | | | | | | | makes JSON creation far more bulletproof (and also faster)
* | | | improve invalid config command error messageRainer Gerhards2012-06-271-1/+2
| | | |
* | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-111-4/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-111-4/+8
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: ChangeLog
| | * | | bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-111-4/+8
| | | | | | | | | | | | | | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
| * | | | bugfix: did not compile under solaris due to $uptime property codeRainer Gerhards2012-06-081-0/+5
| | | | | | | | | | | | | | | | | | | | For the time being, $uptime is not supported on Solaris
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-065-33/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-013-13/+17
| |\ \ \ \
* | \ \ \ \ Merge branch 'v5-beta' into betaRainer Gerhards2012-06-065-33/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-065-33/+26
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
| | * | | | | bugfix: property PROCID was empty instead of proper nilvalue if not presentRainer Gerhards2012-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is not present, it must have the nilvalue "-" as of RFC5424 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332 Thanks to John N for reporting this issue.
| | * | | | | bugfix: potential hang due to mutex deadlockRainer Gerhards2012-06-063-29/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=316 Thanks to Andreas Piesk for reporting&analyzing this bug as well as providing patches and other help in resolving it.
| | * | | | | fixing memleak in recent group resolve patchRainer Gerhards2012-06-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also added some error checking
| | * | | | | call getgrnam_r repeatedly to get all group members.Alec Warner2012-06-061-3/+12
| | | |/ / / | | |/| | |
* | | | | | fixing small memleak during config read phaseRainer Gerhards2012-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traditional system line buffers were not freed. semi-static memory leak during config load phase, did not grow while processing messages. Usually less than 5k during the whole runtime.
* | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-011-10/+16
|\| | | | |
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-011-10/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * | | | some better code to handle queue congestionRainer Gerhards2012-06-011-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a minor optimization to spare some cycles if the timeout is set to immediate discard
* | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-292-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-292-3/+2
| |\| | | |
| | * | | | bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-292-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if rsyslog was set to auto-background (thus fork, the default) and debug mode to stdout was enabled, debug messages ended up in the first log file opened. Currently, stdout logging is completely disabled in forking mode (but writing to the debug log file is still possible). This is a change in behaviour, which is under review. If it causes problems to you, please let us know. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-101-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and full delayable sources somewhat smarter and permits, assuming sufficient timouts, to persist message up to the max queue capacity. Also some nits debug instrumentation have been fixed.
* | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-101-11/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-101-11/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-101-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and full delayable sources somewhat smarter and permits, assuming sufficient timouts, to persist message up to the max queue capacity. Also some nits in debug instrumentation have been fixed.
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-101-13/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | Merge branch 'v5-beta'Rainer Gerhards2012-05-101-13/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-101-13/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | cleanup: removing no longer needed macrosRainer Gerhards2012-05-041-13/+0
| | | | | |
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-031-7/+47
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-271-55/+57
| |\ \ \ \ \
| | * | | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-271-55/+57
| | | | | | |
| * | | | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-183-5/+41
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-183-5/+41
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c
* | | \ \ \ \ \ \ Merge branch 'v6-stable'Rainer Gerhards2012-05-031-6/+47
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-7/+47
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | bugfix: rsyslog did not terminate when delayable inputs were blockedRainer Gerhards2012-05-031-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...due to unvailable sources. Fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=299 Thanks to Marcin M for bringing up this problem and Andre Lorbach for helping to reproduce and fix it.
| | * | | | | | | bugfix: inside queue.c, some thread cancel states were not correctly reset.Rainer Gerhards2012-05-031-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this is a bug, we assume it did have no practical effect because the reset as it was done was set to the state the code actually had at this point. But better fix this...
| | * | | | | | | bugfix: active input in "light delay state" could block rsyslog terminationRainer Gerhards2012-04-271-0/+4
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | at least for prolonged period of time...