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

	Commit message (Collapse)	Author	Age	Files	Lines
*	finishing touches for 5.1.2v5.1.2	Rainer Gerhards	2009-07-08	4	-4/+14
\|
*	Merge branch 'v4-devel'	Rainer Gerhards	2009-07-08	12	-252/+397
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/debug.h runtime/stream.c
\| *	added capability to write incomplete buffers after an inactivity timeout	Rainer Gerhards	2009-07-07	2	-7/+40
\| \| \| \| \| \| \| \| \| \| \| \|	for the stream class and thus finally activating omfile's timeout capability in a useful way without polling and too-high performance overhead.
\| *	fixed a bug introduced today that lead to an abort in queue disk mode	Rainer Gerhards	2009-07-07	4	-11/+15
\| \|
\| *	Merge branch 'v4-beta' into v4-devel	Rainer Gerhards	2009-07-07	2	-10/+17
\| \|\
\| * \|	solved a race condition	Rainer Gerhards	2009-07-07	4	-16/+52
\| \| \|
\| * \|	clean solution for "writing" arbrietary-size user buffers to a stream	Rainer Gerhards	2009-07-07	1	-42/+28
\| \| \|
\| * \|	stream now uses a singular buffer strucuture for writing	Rainer Gerhards	2009-07-07	1	-6/+12
\| \| \|
\| * \|	moved locking primitives	Rainer Gerhards	2009-07-07	1	-3/+19
\| \| \|
\| * \|	moved zip part to writer thread	Rainer Gerhards	2009-07-06	2	-71/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... this is necessary in preparation for the final solution (we need to have a "unified" writer). If it causes worse performance to have the zip writher togehter with the synchronous write, we may do an async write...
\| * \|	some minor cleanup	Rainer Gerhards	2009-07-06	2	-17/+18
\| \| \|
\| * \|	Merge branch 'v4-beta' into v4-devel	Rainer Gerhards	2009-07-06	2	-2/+4
\| \|\ \
\| * \| \|	first shot at asynchronous stream writer with timeout capability	Rainer Gerhards	2009-07-06	12	-89/+201
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... seems to work on quick testing, but needs a far more testing and improvement. Good milestone commit.
* \| \| \|	Merge branch 'v4-beta'	Rainer Gerhards	2009-07-07	3	-18/+35
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	bugfix: property msg was lost when working with disk queues	Rainer Gerhards	2009-07-07	2	-6/+13
\| \| \| \|
\| * \| \|	bugfix: properties inputname, fromhost, fromhost-ip were lost	Rainer Gerhards	2009-07-07	2	-5/+5
\| \| \|/ \| \|/\| \| \| \| \| \| \|	... when working with disk queues.
\| * \|	performance enhancement: much faster, up to twice as fast	Rainer Gerhards	2009-07-06	2	-2/+4
\| \|/ \| \| \| \| \| \| \| \| \| \|	(depending on configuration). This was a small change, but with big results. There is more potential to explore, but the effects were so dramatic that I think it makes sense to include this fix.
\| *	bugfix: abort condition when RecvFrom was not set and message reduction was on	Rainer Gerhards	2009-07-06	2	-6/+14
\| \| \| \| \| \| \| \|	Happend e.g. with imuxsock.
* \|	re-enabled a test	Rainer Gerhards	2009-07-03	1	-2/+2
\| \|
* \|	finishing touches for 5.1.1v5.1.1	Rainer Gerhards	2009-07-03	1	-1/+1
\| \|
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2009-07-03	52	-858/+3661
\|\ \ \| \|/ \|/\| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/datetime.c
\| *	added yet another forgotten file...	Rainer Gerhards	2009-07-02	1	-0/+1
\| \|
\| *	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-07-02	7	-8/+284
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \|	fixed missing file in distribution tarball	Rainer Gerhards	2009-07-02	1	-0/+1
\| \| \|
\| * \|	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-07-01	35	-282/+1003
\| \|\ \
\| * \| \|	fixed small compile issue	Rainer Gerhards	2009-06-27	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-06-26	10	-207/+364
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| * \ \ \	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-06-26	16	-240/+231
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-06-25	6	-18/+29
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/queue.c
\| * \| \| \| \| \|	bugfix: subtle synchronization issue	Rainer Gerhards	2009-06-25	3	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This may have caused a segfault under strange circumstances (but if we just run long enough with a high enough message volume, even the strangest circumstances will occur...)
\| * \| \| \| \| \|	improvements/fixes in queue termination timeout handling	Rainer Gerhards	2009-06-25	4	-5/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- bugfix: subtle (and usually irrelevant) issue in timout processing timeout could be one second too early if nanoseconds wrapped - set a more sensible timeout for shutdow, now 1.5 seconds to complete processing (this also removes those cases where the shutdown message was not written because the termination happened before it)
\| * \| \| \| \| \|	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-06-25	3	-2/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/atomic.h runtime/wti.c
\| * \| \| \| \| \| \|	added a few atomic operations	Rainer Gerhards	2009-06-25	4	-20/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mostly to get thread debugger errors clean (plus, of course, it makes things more deterministic)
\| * \| \| \| \| \| \|	bugfix: mutex was sometimes released when not being held	Rainer Gerhards	2009-06-24	1	-4/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-06-24	2	-0/+4
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	quick and dirty fix for one race condition	Rainer Gerhards	2009-06-24	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is intentionally quick & dirty, as I would like to do some better patch, if possible. For that, I probably need the commented-out code, thus no delete.
\| * \| \| \| \| \| \| \|	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-06-24	3	-15/+17
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IMPORTANT: this merge did NOT include the (important) changes to action.c . Consolidating them was too hard (aka "error-prone") because of the large differences in the code base. The fixes will be redone with a later commit. Conflicts: action.c configure.ac doc/manual.html
\| * \| \| \| \| \| \| \| \|	updated project status	Rainer Gerhards	2009-06-24	3	-11/+20
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'omfile' into v5-devel	Rainer Gerhards	2009-06-23	16	-231/+253
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| * \ \ \ \ \ \ \ \ \	Merge branch 'omfile' into v5-devel	Rainer Gerhards	2009-06-22	4	-38/+17
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	adapted (and improved) input batching to v5 engine	Rainer Gerhards	2009-06-22	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'omfile' into v5-devel	Rainer Gerhards	2009-06-22	4	-45/+40
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'omfile' into v5-devel	Rainer Gerhards	2009-06-22	2	-1/+19
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	bugfix: huge memory leak in queue engine	Rainer Gerhards	2009-06-22	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(made rsyslogd unusable in production). Occured if at least one queue was in direct mode (the default for action queues).
\| * \| \| \| \| \| \| \| \| \| \| \| \|	some post-merge cleanup	Rainer Gerhards	2009-06-22	2	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'omfile' into tmp	Rainer Gerhards	2009-06-22	71	-798/+1551
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was a complex manual merge, especially in action.c. So if there occur some problems, this would be a good point to start troubleshooting. I run a couple of tests before commiting and they all went well. Conflicts: action.c action.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'omfile' into v5-devel	Rainer Gerhards	2009-06-16	79	-1607/+3847
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note that this was NOT a trivial merge, and there may be some issues. This needs to be seen when we continue developing. Conflicts: runtime/msg.h runtime/obj.h runtime/queue.c runtime/srUtils.h runtime/stream.c runtime/stream.h runtime/wti.c tests/Makefile.am tools/omfile.c tools/syslogd.c
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-06-04	2	-3/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h tests/Makefile.am
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-06-04	21	-27/+1641
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/rsyslog.h
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-05-29	1	-3/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \