rsyslog.git - rsyslog development for Lumberjack - various unofficial and potentially rebased branches

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'beta'	Rainer Gerhards	2012-07-24	1	-0/+49
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| *	Merge branch 'v5-stable' into beta	Rainer Gerhards	2012-07-24	1	-3/+5
\| \|\
\| * \|	debug log: cleaned up & streamlined queue param output	Rainer Gerhards	2012-07-05	1	-20/+43
\| \| \|
\| * \|	debug log: emit (some) action queue parameters to debug log	Rainer Gerhards	2012-07-05	1	-0/+26
\| \| \|
* \| \|	Merge branch 'v5-stable'	Rainer Gerhards	2012-07-24	1	-3/+5
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	bugfix: DA queue could cause abort	Rainer Gerhards	2012-07-24	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked.
* \| \|	Merge branch 'beta'	Rainer Gerhards	2012-06-01	1	-10/+16
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'v5-beta' into beta	Rainer Gerhards	2012-06-01	1	-10/+16
\| \|\ \
\| \| * \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2012-06-01	1	-10/+16
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/queue.c
\| \| \| *	some better code to handle queue congestion	Rainer Gerhards	2012-06-01	1	-10/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a minor optimization to spare some cycles if the timeout is set to immediate discard
\| \| * \|	bugfix: disk queue was not persisted on shutdown, regression of fix to	Rainer Gerhards	2012-05-10	1	-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 'v5-stable' into v5-beta	Rainer Gerhards	2012-05-03	1	-7/+47
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-04-07	1	-4/+8
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac doc/manual.html
\| \| * \ \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-14	1	-3/+2
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| \| * \ \ \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-12	1	-0/+9
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
* \| \| \| \| \| \| \|	added --enable-debugless configure option for very high demanding environments	Rainer Gerhards	2012-05-29	1	-6/+6
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This actually at compile time disables a lot of debug code, resulting in some speedup (but serious loss of debugging capabilities)
* \| \| \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-05-10	1	-11/+5
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \| \| \|	bugfix: disk queue was not persisted on shutdown, regression of fix to	Rainer Gerhards	2012-05-10	1	-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 'v6-stable'	Rainer Gerhards	2012-05-03	1	-6/+47
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/syslogd.c
\| * \| \| \| \|	bugfix: rsyslog did not terminate when delayable inputs were blocked	Rainer Gerhards	2012-05-03	1	-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 Gerhards	2012-05-03	1	-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 termination	Rainer Gerhards	2012-04-27	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	at least for prolonged period of time...
* \| \| \| \| \|	Merge branch 'v5-stable-newstats'	Rainer Gerhards	2012-04-07	1	-0/+1
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
\| * \| \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-04-07	1	-4/+8
\| \|\\| \| \| \| \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| * \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-03-14	1	-3/+2
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
\| * \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-03-12	1	-1/+8
\| \|\ \ \ \
\| * \| \| \| \|	added configuration directives to customize queue light delay marks	Rainer Gerhards	2012-02-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	$MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens.
\| * \| \| \| \|	added instrumentation	Rainer Gerhards	2011-12-19	1	-1/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-04-07	1	-4/+8
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵	Tomas Heinrich	2012-04-05	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \| \| \| \|	bugfix: segfault if disk-queue was started up with old queue file	Tomas Heinrich	2012-04-05	1	-3/+6
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \| \| \|	added "date-unixtimestamp" property replacer option to format as a unix ↵	Rainer Gerhards	2012-03-29	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	timestamp
* \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-03-17	1	-3/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
\| * \| \| \|	changed statsobj interface and added better doc	Rainer Gerhards	2012-03-14	1	-3/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-03-12	1	-0/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/queue.c
\| * \| \|	bugfix: stopped DA queue was never processed after a restart	Rainer Gerhards	2012-03-12	1	-1/+8
\| \|/ / \| \| \| \| \| \| \| \| \|	...due to a regression from statistics module.
* \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-12-19	1	-0/+9
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c plugins/imudp/imudp.c
\| * \|	experimental: added first stats counter to action object	Rainer Gerhards	2011-12-16	1	-1/+1
\| \| \|
\| * \|	more work on queue statistics counter	Rainer Gerhards	2011-12-16	1	-4/+8
\| \| \|
\| * \|	new stats counter "discarded" for queue object	Rainer Gerhards	2011-12-16	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Tells how many messages have been discarded due to queue full condition.
\| * \|	Merge branch 'v5-stable' into v5-devel	Andre Lorbach	2011-08-18	1	-0/+9
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
* \| \|	Merge branch 'beta'	Andre Lorbach	2011-08-18	1	-1/+8
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: runtime/queue.c
\| * \|	removed debug code from action.c and runtime/queue.c after testing	Andre Lorbach	2011-08-18	1	-4/+0
\| \| \|
\| * \|	bugfix: fixed incorrect state handling for Discard Action (transactions)	Andre Lorbach	2011-08-18	1	-0/+13
\| \| \|
* \| \|	milestone: queue-params are properly initialized for action queues	Rainer Gerhards	2011-08-01	1	-0/+34
\| \| \|
* \| \|	milestone: generic action parameters parsed via new config system	Rainer Gerhards	2011-08-01	1	-1/+1
\| \| \|
* \| \|	milestone: queue object now has a param handler for new conf interface	Rainer Gerhards	2011-07-22	1	-39/+168
\| \|/ \|/\| \| \| \| \|	... and action queue defs use this new interface (but not yet the main queues)
* \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-06-21	1	-4/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	bugfix: mutex was invalidly left unlocked during action processingv5.8.2	Rainer Gerhards	2011-06-21	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	At least one case where this can occur is during thread shutdown, which may be initiated by lower activity. In most cases, this is quite unlikely to happen. However, if it does, data structures may be corrupted which could lead to fatal failure and segfault. I detected this via a testbench test, not a user report. But I assume that some users may have had unreproducable aborts that were cause by this bug.
* \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-05-11	1	-1/+5
\|\\|