summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\| |
| * | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-091-5/+5
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
| | |
* | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-091-0/+5
| | | | | | | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-011-1/+1
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-011-1/+1
| |\| | | | | | | | | | | | | Conflicts: action.c
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-011-1/+1
| | |\
| | | * bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-271-2/+6
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-271-2/+6
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-111-1/+1
| | |\ \
| | | * | Added MsgDup bugfix from v5-stable into v4-stable branchAndre Lorbach2011-08-111-1/+1
| | | | |
| | * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-091-1/+1
| | |\| |
| | * | | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-7/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
generated by cgit (git 2.34.1) at 2024-06-07 10:21:33 +0000