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

	Commit message (Collapse)	Author	Age	Files	Lines
*	v6.1/2 scoping support removed from plugins	Rainer Gerhards	2012-01-19	1	-3/+2
\|
*	Merge branch 'v6-stable-noscoping' into master	Rainer Gerhards	2012-01-19	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
\| *	undoing v6.1 config scoping interface, part I	Rainer Gerhards	2012-01-18	1	-3/+3
\| \| \| \| \| \| \| \|	The most common files are now changed, more needs to be done.
\| *	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-14	1	-15/+14
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imtcp/imtcp.c
* \| \	Merge branch 'v5-stable' into master	Rainer Gerhards	2012-01-18	1	-15/+14
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-14	1	-15/+14
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
\| \| * \|	relicense parts under ASL 2.0	Rainer Gerhards	2012-01-11	1	-15/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after carful check for copyright holder
* \| \| \|	milestone: added module config names	Rainer Gerhards	2011-07-20	1	-0/+1
\| \| \| \|
* \| \| \|	renaming conf.* wasn't a good idea -- undoing	Rainer Gerhards	2011-04-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2".
* \| \| \|	renamed conf.c to legacyconf.c to make room for new config system	Rainer Gerhards	2011-04-19	1	-1/+1
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-03-11	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
\| * \|	added work-around for bug in gtls, which causes fd leak when using TLS	Bojan Smojver	2011-02-23	1	-0/+1
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \|	fixed regression from last commit	Rainer Gerhards	2010-07-27	1	-0/+1
\| \| \| \| \| \| \| \|	config variables were not properly initialized
* \|	milestone commit: output plugin interface changes (may NOT run)	Rainer Gerhards	2010-07-27	1	-9/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The output interface has been changed, but we do not yet utilize the new interface. Also, it looks like a regression was introduced. But before hunting it down, I'd like to make a commit (what also easys the regresion hunt).
* \|	moving towards scoping inside rsyslog.conf	Rainer Gerhards	2010-07-21	1	-3/+3
\|/ \| \| \|	first step: adding object-type specifier to config statement table
*	solved alignment errors on Solaris Sparc	Rainer Gerhards	2010-04-22	1	-1/+1
\|
*	Merge branch 'v4-stable' into v4-beta & BUGFIX	Rainer Gerhards	2009-10-01	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac doc/manual.html runtime/datetime.h runtime/parser.c runtime/rsyslog.h tools/syslogd.c v4-stable had a bug with RFC5424-formatted structured data, which showed was detected by the enhanced automatted testbench of v4-beta.
* \|	bugfix: message could be truncated after TAG, often when forwarding	Rainer Gerhards	2009-07-09	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \|	This was a result of an internal processing error if maximum field sizes had been specified in the property replacer. Also did some testbench improvements, including omstdout.
* \|	re-enabled pipe, tty and console in omfile	Rainer Gerhards	2009-06-12	1	-1/+1
\|/ \| \| \| \| \| \|	... by moving code to stream.c. Thanks to the new design, new cases are not really needed, resulting in cleaner code. I also did a cleanup of header file usage as a side-activity.
*	fixed some portability issues	Rainer Gerhards	2009-03-16	1	-1/+1
\| \| \| \| \|	first noticed on FreeBSD Also, some cosmetic improvements.
*	improved test suite and added test for new output module interface	Rainer Gerhards	2009-04-03	1	-0/+2
\| \| \| \| \| \| \| \|	The testbench has now a generic driver that can run a whole class of test suites just by providing a config file and test cases. This does not cover all testing needs, but a lot. We have now added one test for the new array-passing output plugin interface.
*	added a new way how output plugins may be passed parameters.	Rainer Gerhards	2009-04-03	1	-2/+78
\| \| \| \| \|	This is more efficient for some outputs. They new can receive fields not only as a single string but rather in an array where each string is seperated.
*	improved testing support	Rainer Gerhards	2009-03-19	1	-0/+125
	worked on ways to provide a better test suite: - added -T rsyslogd command line option, enables to specify a directory where to chroot() into on startup. This is NOT a security feature but introduced to support testing. Thus, -T does not make sure chroot() is used in a secure way. (may be removed later) - added omstdout module for testing purposes. Spits out all messages to stdout - no config option, no other features - modified $ModLoad statement so that for modules whom's name starts with a dot, no path is prepended (this enables relative-pathes and should not break any valid current config)