rsyslog - Modifications to rsyslog---see v3-stable-kaz branch

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-10-19	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Conflicts: runtime/nsdpoll_ptcp.c
\| *	fix epoll-enabled code to use correct data member for pointers	Rainer Gerhards	2012-10-19	1	-2/+2
\| \|
* \|	Remove no longer needed function	Rainer Gerhards	2012-09-23	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Thanks to Andreas Stieger from Novell/SUSE for alerting us. This function was introduced as part of the new config system, but never was actually used (aka "not needed").
* \|	Simplify	Rainer Gerhards	2012-09-20	1	-4/+1
\| \|
* \|	Added missing iRet handler code into CheckConnection() in netstrm.c	Andre Lorbach	2012-09-20	1	-1/+4
\| \|
* \|	Fix missing Sysklogd template	Milan Bartos	2012-09-20	1	-0/+3
\| \| \| \| \| \| \| \|	modified: runtime/rsconf.c
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-09-14	1	-1/+1
\|\\|
\| *	Debug logging slightly improved	Rainer Gerhards	2012-09-14	1	-1/+1
\| \|
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-09-13	1	-78/+83
\|\\| \| \| \| \| \| \| \| \|	Conflicts: runtime/rule.c
\| *	bugfix: invalid property name in property-filter could cause abort	Rainer Gerhards	2012-09-13	1	-56/+63
\| \| \| \| \| \| \| \| \| \| \| \|	...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report
* \|	Fixed TCP CheckConnection handling in omfwd.c.	Andre Lorbach	2012-08-25	5	-8/+17
\| \| \| \| \| \| \| \|	Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly.
* \|	bugfix: omusrsmsg incorrect return state & config warning handling	Rainer Gerhards	2012-08-28	1	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug.
* \|	INCOMPATIBLE: Return {} for missing $!all-json	Miloslav Trmač	2012-08-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	%$!all-json% will return a {}-wrapped object if there are are any events, or when there is an attached (empty) pMsg->event, but an empty string if nothing is attached. Let it return an empty object "{}" in that case for consistency. In particular, this allows $template MongoTemplate,"{%hostname:::jsonf:sys%, %$!all-json:2:$:%" to always result in a valid JSON. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* \|	INCOMPATIBLE: use :, not =, as separator for jsonf	Miloslav Trmač	2012-08-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	JSON fields are "name":value, not "name"=value. Therefore change the jsonf flag to use a colon. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-08-25	9	-34/+34
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
\| *	Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable	Rainer Gerhards	2012-08-25	1	-0/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: template.c
\| \| *	change template.[ch] to ASL 2.0, removing a GPLv3-only patch	Rainer Gerhards	2012-08-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see template.c file header for details Note that this functionality was almost never used in practice
\| \| *	nit: forward-compatible default ruleset name as used in next version	Rainer Gerhards	2012-08-22	1	-1/+1
\| \| \|
\| * \|	small bugfix: stream timeout API use was incorrect	Rainer Gerhards	2012-08-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Thanks to Andre Lorbach for mentioning this.
\| * \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2012-08-22	4	-14/+50
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/ruleset.c
\| \| *	bugfix: multiple main queues with same queue file name were not detected	Rainer Gerhards	2012-08-22	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog.
\| * \|	changed TRUE/FALSE to RSTRUE/RSFALSE	Rainer Gerhards	2012-08-22	7	-27/+26
\| \| \| \| \| \| \| \| \| \| \| \|	This is done to prevent name claches with libraries.
\| * \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2012-06-11	1	-4/+8
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
* \| \ \	Merge branch 'v5-stable' into beta	Rainer Gerhards	2012-08-20	1	-0/+37
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	nitfix: remove quirck in new debug message code	Rainer Gerhards	2012-08-01	1	-4/+2
\| \| \| \|
\| * \| \|	more elaborate debug logging for object deserializer	Rainer Gerhards	2012-08-01	1	-0/+39
\| \| \| \|
\| * \| \|	undo last queue patch - caused a regression	Rainer Gerhards	2012-08-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some more elaborate patch is needed and will be provided
\| * \| \|	bugfix: DA queue fixed handling of bad queue files.	Andre Lorbach	2012-07-31	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2012-07-24	2	-9/+9
\|\\| \| \|
\| * \| \|	bugfix: strm class could abort under some circumstances	Rainer Gerhards	2012-07-24	1	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... it could pass a NULL pointer to unlink. Depending on OS implementation, this could (or could not...) lead to a segfault.
\| * \| \|	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.
* \| \|	omelasticsearch: better debug instrumentation	Rainer Gerhards	2012-07-09	1	-2/+0
\| \| \|
* \| \|	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	2	-0/+27
\| \| \|
* \| \|	Merge branch 'master-elasticsearch' into tmp	Rainer Gerhards	2012-06-29	3	-2/+3
\|\ \ \
\| * \| \|	property replacer lost one char when json escaping was necessary	Rainer Gerhards	2012-05-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The character immediately in front of the first escape was lost.
\| * \| \|	omelasticsearch: provide authentication support (UNTESTED)	Rainer Gerhards	2012-04-25	1	-0/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into master-elasticsearch	Rainer Gerhards	2012-04-23	12	-159/+438
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/omelasticsearch/omelasticsearch.c
\| * \| \| \|	permitting plugins to use three string requests	Rainer Gerhards	2012-04-13	2	-4/+8
\| \| \| \| \|
\| * \| \| \|	omelasticsearch: used new property replacer options for default template	Rainer Gerhards	2012-04-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	makes JSON creation far more bulletproof (and also faster)
* \| \| \| \|	improve invalid config command error message	Rainer Gerhards	2012-06-27	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v6-stable' into beta	Rainer Gerhards	2012-06-11	1	-4/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \ \ \ \	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-06-11	1	-4/+8
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \| \|	bugfix: "last message repeated n times" message was missing hostname	Rainer Gerhards	2012-06-11	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
\| * \| \| \| \|	bugfix: did not compile under solaris due to $uptime property code	Rainer Gerhards	2012-06-08	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For the time being, $uptime is not supported on Solaris
\| * \| \| \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-06-06	5	-33/+26
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-06-01	3	-13/+17
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge branch 'v5-beta' into beta	Rainer Gerhards	2012-06-06	5	-33/+26
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/modules.c
\| * \| \| \| \| \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2012-06-06	5	-33/+26
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
\| \| * \| \| \| \|	bugfix: property PROCID was empty instead of proper nilvalue if not present	Rainer Gerhards	2012-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If it is not present, it must have the nilvalue "-" as of RFC5424 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332 Thanks to John N for reporting this issue.