rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 16:20:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,968 Commits 67 Branches 505 Tags
Commit Graph

1960 Commits

Author SHA1 Message Date
Rainer Gerhards
3a7c280e93 integrate logctl into build process 2012-10-02 15:07:41 +02:00
Rainer Gerhards
ca7cd5ef9c Merge branch 'v6-stable' into v6-devel 2012-10-02 11:42:54 +02:00
Rainer Gerhards
c7ccf7d322 Merge branch 'v5-stable' into v6-stable 2012-10-02 11:22:06 +02:00
Andre Lorbach
6387d164bb bugfix: fixed wrong bufferlength for snprintf in tcpflood.c 
The problem occured when using the -f (dynafiles) option,
and caused some tests to fail.
 2012-09-28 07:55:48 -07:00
Rainer Gerhards
2ce900aea2 bugfix: config errors did not always cause statement to fail 
This could lead to startup with invalid parameters.
 2012-09-27 10:03:12 +02:00
Rainer Gerhards
7166461613 imfile: implement support for module parameters via module() stmt 2012-09-27 08:54:28 +02:00
Rainer Gerhards
2952b9196a Merge branch 'v6-stable' into v6-devel-input 2012-09-26 12:26:28 +02:00
Rainer Gerhards
8812ffd58b Merge branch 'v5-stable' into v6-stable 
Conflicts:
	plugins/imrelp/imrelp.c
 2012-09-26 10:56:19 +02:00
Apollon Oikonomopoulos
136f6e0978 enable DNS resolution in imrelp 2012-09-26 10:54:42 +02:00
Rainer Gerhards
32a882199a Merge branch 'v6-stable' into v6-devel 2012-09-21 18:20:45 +02:00
Rainer Gerhards
1be79d5467 bugfix: some valid legacy PRI filters were flagged as errornous 
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358
This happend to filters of the style "local0,local1.*", where the
multiple facilities were comma-separated.
 2012-09-21 11:57:55 +02:00
Rainer Gerhards
760b23aac9 Merge branch 'v6-stable' into v6-devel 
Conflicts:
	ChangeLog
 2012-09-20 10:08:24 +02:00
Rainer Gerhards
1e6469e920 doc: add last bugfix to ChangeLog 2012-09-20 10:07:24 +02:00
Rainer Gerhards
8815435209 Merge branch 'v6-stable' into v6-devel 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
 2012-09-20 09:41:40 +02:00
Rainer Gerhards
e99ca8246f preparing for 6.4.2 release 2012-09-20 09:39:42 +02:00
Rainer Gerhards
762c1a81d5 bugfix: config validation run did not always return correct return state 2012-09-20 08:41:32 +02:00
Rainer Gerhards
c0e35e864a bugfix: config validation run did not always return correct return state 2012-09-20 08:31:03 +02:00
Rainer Gerhards
a85784a480 Merge branch 'v6-stable' into v6-devel 2012-09-19 18:57:24 +02:00
Rainer Gerhards
b40c83090e bugfix: potential abort, if action queue could not be properly started 
This most importantly could happen due to configuration errors.
 2012-09-19 18:57:02 +02:00
Rainer Gerhards
0569f2e581 bugfix: small memory leaks in template() statements 
these were one-time memory leaks during startup, so they did NOT grow
during runtime
 2012-09-17 08:51:26 +02:00
Rainer Gerhards
36b9e37896 fix ChangeLog 
got messed-up during merge :-(
 2012-09-13 12:12:33 +02:00
Rainer Gerhards
b32060e2ed Merge branch 'v6-stable' into v6-devel 
Conflicts:
	ChangeLog
	grammar/rainerscript.c
	grammar/rainerscript.h
	runtime/rule.c
 2012-09-13 12:09:23 +02:00
Rainer Gerhards
66d0561736 Merge branch 'v5-stable' into v6-stable 
Conflicts:
	runtime/rule.c
 2012-09-13 11:32:32 +02:00
Rainer Gerhards
398975cebe bugfix: invalid property name in property-filter could cause abort 
...if action chaining (& operator) was used
http://bugzilla.adiscon.com/show_bug.cgi?id=355
Thanks to pilou@gmx.com for the bug report
 2012-09-13 09:59:07 +02:00
Rainer Gerhards
10bef02e8f bugfix: missing support for escape sequences in RainerScript 
Only \' was supported. Now the usual set is supported. Note that v5
used \x as escape where x was any character (e.g. "\n" meant "n" and NOT
LF). This also means there is some incompatibility to v5 for well-know
sequences. Better break it now than later.
 2012-09-13 09:30:20 +02:00
Rainer Gerhards
4f0672f601 nit: correct messed-up ChangeLog 2012-09-12 18:11:12 +02:00
Rainer Gerhards
70ee0f5b2e Merge branch 'v6-stable' into v6-devel 
Conflicts:
	ChangeLog
 2012-09-12 14:49:07 +02:00
Rainer Gerhards
9aacbcb056 Merge branch 'v5-stable' into v6-stable 
Conflicts:
	ChangeLog
 2012-09-12 14:40:29 +02:00
Cristian Ionescu-Idbohrn
2d538f14e2 remove unused variables (if SCM_CREDENTIALS is not available) 2012-09-12 12:59:38 +02:00
Rainer Gerhards
0c786a66ac Merge branch 'v6-stable' into v6-devel 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
 2012-09-06 12:55:09 +02:00
Rainer Gerhards
9aec3a6e5f preparing for 6.4.1 release 2012-09-06 12:46:19 +02:00
Rainer Gerhards
74b81c8c01 Merge branch 'v6-stable' into v6-devel 2012-09-06 12:00:05 +02:00
Rainer Gerhards
a5e51ced93 milestone: ommongodb supports templates & JSON passing API in place 2012-08-29 14:10:18 +02:00
Rainer Gerhards
7348da7e02 bugfix: imtcp could abort on exit due to invalid free() 2012-08-28 19:07:58 +02:00
Rainer Gerhards
72e1ccbc69 preparing for 6.5.0 release 2012-08-28 09:59:15 +02:00
Rainer Gerhards
ec48c41e27 made new uuid property threadsafe 2012-08-26 14:28:13 +02:00
Rainer Gerhards
d1589cd439 Merge branch 'v6-stable' 2012-08-26 12:29:08 +02:00
Rainer Gerhards
9a9282b86c doc: add incompatible patch info to ChangeLog 2012-08-26 12:27:37 +02:00
Andre Lorbach
88faed212c Fixed TCP CheckConnection handling in omfwd.c. 
Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly.
 2012-08-25 12:08:08 -07:00
Rainer Gerhards
d317382626 bugfix: omusrsmsg incorrect return state & config warning handling 
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.
 2012-08-28 15:09:56 +02:00
Rainer Gerhards
de71589ca3 Merge branch 'v6-stable' 
Conflicts:
	ChangeLog
	configure.ac
	runtime/ruleset.c
	tools/syslogd.c
 2012-08-25 12:19:56 +02:00
Rainer Gerhards
8939ccfffd Merge branch 'v5-stable' into v6-stable 
Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
	runtime/ruleset.c
	template.h
	threads.c
	tools/syslogd.c
 2012-08-25 11:55:41 +02:00
Rainer Gerhards
a568626d4a preparing for 5.10.0 release 2012-08-22 18:54:13 +02:00
Rainer Gerhards
2e6c5633a3 Merge branch 'v5-stable' into v5-beta 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
 2012-08-22 17:15:43 +02:00
Rainer Gerhards
d7f26ff418 preparing for 5.8.13 release 2012-08-22 17:12:57 +02:00
Rainer Gerhards
01fe0fd2ab Merge branch 'v5-stable' into v5-beta 
Conflicts:
	runtime/ruleset.c
 2012-08-22 15:32:05 +02:00
Rainer Gerhards
d92ad440da bugfix: multiple main queues with same queue file name were not detected 
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.
 2012-08-22 14:30:12 +02:00
Rainer Gerhards
c78f1ef538 doc: add imported patch to ChangeLog 2012-08-21 14:37:43 +02:00
Rainer Gerhards
4a24d8e1b6 nitfix: status indication (now: stable) was invalid in ChangeLog 2012-08-20 12:56:27 +02:00
Rainer Gerhards
4ce8111ea6 Merge branch 'v5-stable' into beta 2012-08-20 12:37:39 +02:00