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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \|	solved some race condition in testbench	Rainer Gerhards	2010-04-29	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note that this was NOT a race in rsyslog, but only one in a test case. So it had no implications to the correctness of rsyslogd.
* \| \| \|	adapted new atomic instruction emulation to v5 engine	Rainer Gerhards	2010-04-27	8	-34/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	code did not compile after merge from v4
* \| \| \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-04-27	17	-221/+120
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/Makefile.am runtime/atomic.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h runtime/wtp.c runtime/wtp.h
\| * \| \|	bugfix: problems with atomic operations emulation	Rainer Gerhards	2010-04-27	16	-226/+129
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replaced atomic operation emulation with new code. The previous code seemed to have some issue and also limited concurrency severely. The whole atomic operation emulation has been rewritten.
* \| \| \|	adapted merged code to v5 engine	Rainer Gerhards	2010-04-26	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'v5-stable'	Rainer Gerhards	2010-04-26	5	-12/+49
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	cosmetic: removed left-over debug message	Rainer Gerhards	2010-04-26	1	-1/+0
\| \| \| \|
\| * \| \|	added new test to testbench	Rainer Gerhards	2010-04-26	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... had forgotten this step...
\| * \| \|	bugfix(kind of): output plugin retry behaviour could cause engine to loop	Rainer Gerhards	2010-04-26	4	-12/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The rsyslog engine did not guard itself against output modules that do not properly convey back the tryResume() behaviour. This then leads to what looks like an endless loop. I consider this to be a bug of the engine not only because it should be hardened against plugin misbehaviour, but also because plugins may not be totally able to avoid this situation (depending on the type of and processing done by the plugin).
* \| \| \|	Merge branch 'v5-stable'	Rainer Gerhards	2010-04-26	3	-3/+34
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/diag.sh
\| * \| \|	added testcase for problem with pipe without a reader	Rainer Gerhards	2010-04-26	3	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=186 Note that this adds the test case, but does not yet provide a solution (so make check will hang when executed). Fix will be done next.
* \| \| \|	Merge branch 'v4-devel' into tmp	Rainer Gerhards	2010-04-26	3	-1/+26
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	added new $Sleep directive to hold processing for a couple of seconds during ↵	Rainer Gerhards	2010-04-26	3	-1/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	startup
* \| \| \|	Merge branch 'v5-stable' into master	Rainer Gerhards	2010-04-26	2	-30/+43
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \|	bugfix(minor): status variable was uninitialized	Rainer Gerhards	2010-04-26	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	However, this would have caused harm only if NO parser modules at all were loaded, which would lead to a defunctional configuration at all. And, even more important, this is impossible as two parser modules are built-in and thus can not be "not loaded", so we always have a minimum of two.
\| * \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2010-04-01	4	-16/+24
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/syslogd.c
* \| \ \ \	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-04-23	3	-4/+5
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \|	cosmetic: prepared ChangeLog for next release	Rainer Gerhards	2010-04-23	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	minor fix: invalid duplicated include of config.h	Rainer Gerhards	2010-04-23	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	preparing for 4.7.1 releasev4.7.1	Rainer Gerhards	2010-04-22	3	-3/+3
\| \| \| \| \|
\| * \| \| \|	fixed typo ... that caused compilation to fail on non-Solaris	Rainer Gerhards	2010-04-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of git+ssh://rger@git.adiscon.com/git/rsyslog	Rainer Gerhards	2010-04-23	1	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	updating project status	Rainer Gerhards	2010-04-22	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-04-23	6	-27/+37
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| / / / / \| \|/ / / / \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h runtime/wtp.c
\| * \| \| \|	solved alignment errors on Solaris Sparc	Rainer Gerhards	2010-04-22	6	-29/+34
\| \| \| \| \|
\| * \| \| \|	removed some complier warnings	Rainer Gerhards	2010-04-21	2	-4/+16
\| \| \| \| \|
* \| \| \| \|	cleanup of some compiler warnings	Rainer Gerhards	2010-04-21	2	-5/+17
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v4-devel'	Rainer Gerhards	2010-04-21	3	-0/+7
\|\\| \| \| \|
\| * \| \| \|	bugfix: some race condition in testbench on Solaris/Sparc	Super-User	2010-04-21	3	-0/+7
\| \| \| \| \|
* \| \| \| \|	adopted imsolaris to the new v5 semantics	Rainer Gerhards	2010-04-21	1	-8/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It now supports the new cancel-free termination mode. This is important to get a really reliable solution in all cases. This concludes the initial implementation of imsolaris for v5.
* \| \| \| \|	fixed broken merge	Rainer Gerhards	2010-04-20	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-04-20	10	-118/+343
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imsolaris/imsolaris.c tests/Makefile.am
\| * \| \| \|	doc for imsolaris added	Rainer Gerhards	2010-04-20	3	-0/+49
\| \| \| \| \|
\| * \| \| \|	saved old copy of Java DiagTalker tool	Rainer Gerhards	2010-04-20	2	-0/+3
\| \| \| \| \|
\| * \| \| \|	testbench improvement: Java is no longer needed for testing tool creation	Rainer Gerhards	2010-04-20	4	-8/+165
\| \| \| \| \|
\| * \| \| \|	finalized work on imsolaris	Rainer Gerhards	2010-04-20	1	-110/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Did a couple of clean-ups and made the module more robust. Among others, improved performance and structure, fixed the recovery handler (which did not correctly work before) and straightend out some minor issues. Doc and some platform tests are still missing, but other than that this version looks pretty good.
* \| \| \| \|	Merge branch 'v4-devel'	Rainer Gerhards	2010-04-19	6	-132/+166
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/msg.h runtime/rsyslog.h runtime/stream.c
\| * \| \| \|	improved quality of imsolaris code	Rainer Gerhards	2010-04-19	6	-132/+166
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	including refctoring for a more simple solution
\| * \| \| \|	changed flag value for v5-compatibility	Rainer Gerhards	2010-04-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-04-19	4	-29/+24
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/msg.h
\| * \| \| \|	changed imsolaris to use submitMsg() API	Rainer Gerhards	2010-04-19	3	-28/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This includes a modification to the rsyslog engine so that messages without PRI inside the message can properly be handled.
\| * \| \| \|	minor cleanup	Rainer Gerhards	2010-04-19	3	-3/+3
\| \| \| \| \|
* \| \| \| \|	some cleanup	Rainer Gerhards	2010-04-19	5	-5/+25
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-04-19	25	-1122/+929
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html runtime/debug.c runtime/rsyslog.h tests/Makefile.am tests/diag.sh tests/nettester.c tools/syslogd.c
\| * \| \| \|	some more cleanup	Rainer Gerhards	2010-04-19	3	-29/+11
\| \| \| \| \|
\| * \| \| \|	some platforms seem to need time.h inside msleep.c	Peter Bray	2010-04-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \| \| \|	minor cleanup (cosmetic)	Rainer Gerhards	2010-04-15	2	-70/+52
\| \| \| \| \|
\| * \| \| \|	first version of imsolaris created, cleanup for solaris done	Rainer Gerhards	2010-04-15	11	-620/+420
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	more cleanup required, but things now basically work
\| * \| \| \|	preparing for 4.7.0v4.7.0	Rainer Gerhards	2010-04-14	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'v4-devel' of git+ssh://git.adiscon.com/git/rsyslog into v4-devel	Rainer Gerhards	2010-04-14	3	-49/+23
\| \|\ \ \ \