summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stablev6.2.2.with.unreleased.fixesRainer 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.
* | 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
| * 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
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-013-13/+17
|\|
| * 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
| * 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>
* | 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
| * cleanup: removing no longer needed macrosRainer Gerhards2012-05-041-13/+0
| |
* | 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...
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-183-8/+41
|\|
| * fixed compile bugRainer Gerhards2012-04-181-1/+1
| | | | | | | | | | actually a regression from last bugfix - I just wonder why the other machine did not complain :-S
| * bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-183-8/+41
| | | | | | | | | | | | This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages stored inside the disk queue.
* | Add a system property, PROP_SYS_UPTIME, to place up-time markers into ↵Steven A. Falco2012-04-132-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | rsyslog output. Here is an example template, where this is used: $template CoincidentFileFormat,"[UP=%$uptime%sec] %TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n" and here is an example line of output using the above template: [UP=20sec] Apr 12 21:50:00 atom kernel: imklog 5.8.7, log source = /proc/kmsg started.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-121-44/+64
|\| | | | | | | | | Conflicts: ChangeLog
| * Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com>
| * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-44/+63
| | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-071-4/+8
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵Tomas Heinrich2012-04-051-1/+2
| | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * bugfix: segfault if disk-queue was started up with old queue fileTomas Heinrich2012-04-051-3/+6
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-144-38/+60
|\|
| * changed statsobj interface and added better docRainer Gerhards2012-03-144-38/+60
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-123-2/+11
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * bugfix: stopped DA queue was never processed after a restartRainer Gerhards2012-03-123-2/+11
| | | | | | | | ...due to a regression from statistics module.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-273-17/+19
|\| | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-273-16/+19
| |\
| | * bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵Rainer Gerhards2012-01-271-0/+1
| | | | | | | | | | | | configured
| | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich)
| | * increased max config file line size to 64kRainer Gerhards2012-01-241-1/+4
| | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug)
* | | removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-194-16/+4
| | | | | | | | | | | | to make using pre-v6-plugins even easier
* | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-187-37/+28
| | | | | | | | | | | | The most common files are now changed, more needs to be done.
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1867-1036/+912
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
| | * license changesRainer Gerhards2012-01-1645-704/+617
| | |
| | * runtime license changeRainer Gerhards2012-01-1620-297/+265
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| |\|
| | * license changeRainer Gerhards2012-01-142-35/+30
| | | | | | | | | | | | after careful consideration of affected code
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-092-5/+7
|\| |