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

	Commit message (Collapse)	Author	Age	Files	Lines
*	preparing for 6.3.2v6.3.2	Rainer Gerhards	2011-07-06	1	-1/+1
\|
*	Merge branch 'beta'	Rainer Gerhards	2011-07-06	1	-1/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| *	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-07-06	1	-1/+12
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog doc/manual.html
\| \| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-07-06	1	-1/+5
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| \| *	added support for the ":omusrmsg:" syntax in configuring user messages	Rainer Gerhards	2011-07-06	1	-0/+3
\| \| \| \|
\| \| \| *	preparing for 4.6.6v4.6.6	Rainer Gerhards	2011-06-24	1	-1/+1
\| \| \| \|
\| \| * \|	doc: mentioned Lennart's patch in ChangeLog	Rainer Gerhards	2011-07-02	1	-0/+3
\| \| \| \|
\| * \| \|	prepare for 6.1.10v6.1.10	Rainer Gerhards	2011-06-22	1	-0/+12
\| \| \| \|
* \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-06-27	1	-14/+68
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c
\| * \| \| \|	added support for obtaining timestamp for kernel message from message	Rainer Gerhards	2011-06-24	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the kernel time-stamps messages, time is now take from that timestamp instead of the system time when the message was read. This provides much better accuracy. Thanks to Lennart Poettering for suggesting this feature and his help during implementation.
\| * \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-06-21	1	-2/+24
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \|	added support for obtaining timestamp from system for imuxsock	Rainer Gerhards	2011-06-20	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This permits to read the time a message was submitted to the system log socket. Most importantly, this is provided in microsecond resolution. So we are able to obtain high precision timestampis even for messages that were - as is usual - not formatted with them. This also simplifies things in regard to local time calculation in chroot environments. Many thanks to Lennart Poettering for suggesting this feature, providing some guidance on implementing it and coordinating getting the necessary support into the Linux kernel.
\| * \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-06-16	1	-0/+14
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| * \ \ \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-06-14	1	-0/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog tcpsrv.c
\| * \ \ \ \ \	Merge branch 'v4-devel' into v5-devel	Rainer Gerhards	2011-06-14	1	-0/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tcpsrv.c
\| \| * \ \ \ \ \	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-06-14	1	-0/+3
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-05-11	1	-0/+10
\| \| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	preparing for 5.9.0v5.9.0	Rainer Gerhards	2011-06-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	$ActionName is now also used for naming of queues in impstats...	Rainer Gerhards	2011-06-10	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...as well as in the debug output. This functionality has now been fully tested.
\| * \| \| \| \| \| \| \| \|	Merge branch 'v5-stable-imfile-batches' into v5-devel	Rainer Gerhards	2011-06-06	1	-1/+13
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| \| * \| \| \| \| \| \| \| \|	imfile: added $InputFileMaxLinesAtOnce directive	Rainer Gerhards	2011-05-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	enhanced imfile to support input batching	Rainer Gerhards	2011-05-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	added support to control KEEPALIVE settings in imptcp	Rainer Gerhards	2011-05-13	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this has not yet been added to imtcp, but could be done on request
\| * \| \| \| \| \| \| \| \| \|	imptcp: added capability to activate keep-alive at socket layer	Rainer Gerhards	2011-05-11	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-05-11	1	-0/+20
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'v4-devel' into v5-devel	Rainer Gerhards	2011-05-09	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/parser.c tests/Makefile.am
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-05-09	1	-0/+37
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
\| \| * \| \| \| \| \| \| \| \| \| \|	bugfix: a slightly more informative error message when a TCP	Rainer Gerhards	2011-05-02	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	connections is aborted
\| \| * \| \| \| \| \| \| \| \| \| \|	bugfix: PRI was invalid on Solaris for message from local log socket	Corey Smith	2011-03-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: root <root@localhost.localdomain>
\| \| * \| \| \| \| \| \| \| \| \| \|	imudp: removing new scheduling priority setting code	Rainer Gerhards	2011-01-10	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as it had too many implications. This will now be part of v5 only.
\| * \| \| \| \| \| \| \| \| \| \| \|	added capability for imtcp to activate keep-alive packets	Rainer Gerhards	2011-05-09	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	at the socket layer. reference: http://kb.monitorware.com/post20791.html
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-05-03	1	-0/+24
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	better handling of queue i/o errors in disk queues.	Rainer Gerhards	2011-05-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is kind of a bugfix, but a very intrusive one, thus it goes into the devel version first. Right now, "file not found" is handled and leads to the new emergency mode, in which disk action is stopped and the queue run in direct mode. An error message is emited if this happens.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'beta'	Rainer Gerhards	2011-06-21	1	-1/+57
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-06-21	1	-1/+31
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
\| \| * \| \| \| \| \| \| \| \| \| \| \|	bugfix: mutex was invalidly left unlocked during action processingv5.8.2	Rainer Gerhards	2011-06-21	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| * \| \| \| \| \| \| \| \| \| \| \|	preparing for 5.8.2	Rainer Gerhards	2011-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	bugfix: problems in failover action handling	Rainer Gerhards	2011-06-20	1	-1/+2
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-06-16	1	-0/+6
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'v3-stable' into v4-stable	Rainer Gerhards	2011-06-16	1	-0/+6
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/datetime.c
\| \| \| \| * \| \| \| \| \| \| \| \|	bugfix: timestamp was incorrectly calculated for timezones with minute offset	Rainer Gerhards	2011-06-16	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
\| \| * \| \| \| \| \| \| \| \| \| \|	bugfix: problems in failover action handling	Rainer Gerhards	2011-06-16	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
\| \| * \| \| \| \| \| \| \| \| \| \|	bugfix/improvement:$WorkDirectory now gracefully handles trailing slashes	Rainer Gerhards	2011-06-15	1	-0/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	preparing for 6.1.9 releasev6.1.9	Rainer Gerhards	2011-06-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-06-14	1	-0/+11
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/nsd_gtls.c tcpsrv.c tests/Makefile.am
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-06-14	1	-0/+3
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tcpsrv.c
\| \| \| * \| \| \| \| \| \| \| \|	bugfix: memory leak in imtcp & subsystems under some circumstances	Rainer Gerhards	2011-06-14	1	-0/+3
\| \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This leak is tied to error conditions which lead to incorrect cleanup of some data structures. [backport from v6, limited testing under v4]
\| \| * \| \| \| \| \| \| \| \|	bugfix: memory leak in imtcp & subsystems under some circumstances	Rainer Gerhards	2011-06-10	1	-0/+5
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This leak is tied to error conditions which lead to incorrect cleanup of some data structures. Note: this is a backport from v6. In v5, we currently do not have the toolchain to verify the original problem and that it is solved. So this patch is preliminary and subject to change as work progresses.
\| * \| \| \| \| \| \| \| \|	bugfix: $ActionFileDefaultTemplate did not work	Rainer Gerhards	2011-06-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262
* \| \| \| \| \| \| \| \| \|	bugfix: memory leak in imtcp & subsystems under some circumstances	Rainer Gerhards	2011-06-10	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This leak is tied to error conditions which lead to incorrect cleanup of some data structures.