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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \|	preparing for 6.3.9 (beta) releasev6.3.9	Rainer Gerhards	2012-05-22	1	-1/+1
\| \| \| \|
* \| \| \|	bugfix: imtcp could cause hang during reception	Rainer Gerhards	2012-05-16	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this also applied to other users of core file tcpsrv.c, but imtcp was by far the most prominent and widely-used, the rest rather exotic (like imdiag) NOTE: this patch is probably not 100% correct and may cause problems if multiple tcpsrv.c users existing within a configuration. The next step is to evaluate this and probably slightly change the worker thread startup/shutdown location.
* \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-05-10	1	-1/+25
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-05-10	1	-0/+14
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \|	bugfix: disk queue was not persisted on shutdown, regression of fix to	Rainer Gerhards	2012-05-10	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \|	preparing for 6.2.1v6.2.1	Rainer Gerhards	2012-05-10	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-05-10	1	-0/+4
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
* \| \| \|	Merge branch 'v5-beta'	Rainer Gerhards	2012-05-10	1	-0/+4
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \|	Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta	Rainer Gerhards	2012-05-10	1	-1/+1
\| \|\ \ \
\| \| * \| \|	preparing for 5.9.7v5.9.7	Rainer Gerhards	2012-05-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2012-05-10	1	-0/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| / \| \| \| \|/ \| \| \|/\|	Conflicts: ChangeLog
\| \| * \|	bugfix/tcpflood: sending small test files did not work correctly	Rainer Gerhards	2012-05-10	1	-0/+3
\| \| \| \|
\| * \| \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2012-05-03	1	-1/+27
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \|	cosmetic: new version in ChangeLog	Rainer Gerhards	2012-04-27	1	-0/+2
\| \| \| \|
\| * \| \|	Merge branch 'v5-stable-field-substring' into v5-beta	Rainer Gerhards	2012-04-27	1	-0/+1
\| \|\ \ \
\| \| * \| \|	added capability to specify substrings for field extraction mode	Rainer Gerhards	2012-04-27	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-05-03	1	-1/+37
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/syslogd.c
\| * \| \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-05-03	1	-1/+27
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \| \|	preparing for 5.8.11 releasev5.8.11	Rainer Gerhards	2012-05-03	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	bugfix: ommysql did not properly init/exit the mysql runtime library	Rainer Gerhards	2012-05-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This could lead to segfaults. Triggering condition: multiple action instances using ommysql. Thanks to Tomas Heinrich for reporting this problem and providing an initial patch (which my solution is based on, I need to add more code to clean the mess up).
\| \| * \| \|	bugfix: rsyslog did not terminate when delayable inputs were blocked	Rainer Gerhards	2012-05-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...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	-0/+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/+2
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	at least for prolonged period of time...
\| * \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-04-19	1	-0/+2
\| \|\\| \|
* \| \| \|	bugfix/omfile: template action parameter was not accepted	Rainer Gerhards	2012-05-03	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(and template name set to "??" if the parameter was used) Thanks to Brian Knox for alerting us on this bug.
* \| \| \|	Merge branch 'master-fieldext'	Rainer Gerhards	2012-04-26	1	-0/+1
\|\ \ \ \
\| * \| \| \|	added capability to specify substrings for field extraction mode	Rainer Gerhards	2012-04-26	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	bugfix: omudpspoof did not work correctly if no spoof hostname was configured	Rainer Gerhards	2012-04-23	1	-0/+2
\|/ / / /
* \| \| \|	Merge branch 'v5-beta'	Rainer Gerhards	2012-04-19	1	-0/+4
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imptcp/imptcp.c
\| * \| \|	Merge branch 'v5-stable-newstats' into v5-beta	Rainer Gerhards	2012-04-19	1	-0/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| \| * \ \	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-04-19	1	-0/+2
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	doc: added last bugfix to ChangeLog	Rainer Gerhards	2012-04-19	1	-0/+2
\| \| \| \| \|
\| \| * \| \|	doc: add last bugfix to changelog	Rainer Gerhards	2012-04-19	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and bump up version
\| * \| \| \|	Merge branch 'v5-stable-newstats' into v5-beta	Rainer Gerhards	2012-04-18	1	-0/+4
\| \|\\| \| \|
\| \| * \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-04-18	1	-0/+4
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/msg.c
* \| \| \| \|	added the "jsonf" property replacer option (and fieldname) & bugfix	Rainer Gerhards	2012-04-19	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary
* \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-04-18	1	-0/+8
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h
\| * \| \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-04-18	1	-0/+4
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	bugfix: assigned ruleset was lost when using disk queues	Rainer Gerhards	2012-04-18	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-04-12	1	-0/+5
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
* \| \| \| \|	bugfix/imuxsock: configured hostname was not used	Rainer Gerhards	2012-04-16	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	bugfix/imuxsock: solving abort if hostname was not set	Rainer Gerhards	2012-04-16	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	preparing for 6.3.8 releasev6.3.8	Rainer Gerhards	2012-04-16	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-beta'	Rainer Gerhards	2012-04-12	1	-14/+39
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
\| * \| \| \|	preparing for 5.9.6v5.9.6	Rainer Gerhards	2012-04-12	1	-2/+5
\| \| \| \| \|
\| * \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-04-12	1	-0/+5
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-04-12	1	-0/+5
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
\| \| \| * \|	doc: credits update for last bugfix	Rainer Gerhards	2012-04-11	1	-1/+2
\| \| \| \| \|
\| \| \| * \|	bugfix: hostname was not requeried on HUP	Rainer Gerhards	2012-04-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks to Marius Tomaschewski for reporting this bug.
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2012-04-07	1	-0/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c