3861 Commits

Author SHA1 Message Date
a9b0ddd780 Experimentally added mutex lock in getMSGID in order to fix bug 275. 2011-07-26 12:20:41 +02:00
Rainer Gerhards
d2b045c502 doc: cleanup of copy-and-paste error in comment
thanks to darix for alerting me
2011-07-13 13:00:08 +02:00
Rainer Gerhards
388633166e Merge branch 'v4-stable' into v5-stable 2011-07-11 12:42:08 +02:00
Rainer Gerhards
1234d7c8cd doc: updated rsyslog.conf man page with new syntaxes 2011-07-11 12:41:16 +02:00
Rainer Gerhards
a9933094b2 preparing for 5.8.3 v5.8.3 2011-07-11 10:43:58 +02:00
Rainer Gerhards
d66d3d6033 added warning message for old-style outchannel syntax 2011-07-11 10:08:16 +02:00
Rainer Gerhards
398966be6d Merge branch 'v4-stable' into v5-stable
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/diag.sh
2011-07-11 10:08:13 +02:00
Rainer Gerhards
dc1dd284c2 preparing for 4.6.7 release v4.6.7 2011-07-11 08:55:53 +02:00
Rainer Gerhards
5442adf8f4 support for :omfile: forward compatibility directive 2011-07-11 08:37:11 +02:00
Rainer Gerhards
68a0159400 Merge branch 'v4-stable' into v5-stable
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2011-07-06 08:07:04 +02:00
Rainer Gerhards
f09ee69ee1 added support for the ":omusrmsg:" syntax in configuring user messages 2011-07-06 07:52:50 +02:00
Rainer Gerhards
4b29a27782 doc: ./configure --help invalidly showed imdiag enabled by default
Thanks to Frédéric L. W. Meunier for bringing this to my attention.
2011-07-06 07:23:35 +02:00
Rainer Gerhards
e8e881e979 doc: mentioned Lennart's patch in ChangeLog 2011-07-02 12:55:54 +02:00
Lennart Poettering
6e222ec9ef systemd: direct stdout/stderr of rsyslog to null
This allows systemd upstream to set stdout/stderr of all spawned
services by default to 'syslog'. In order to avoid log loops rsyslog
itself must be have its stdout/stderr connected to 'null' in that case,
however.
2011-07-02 12:54:39 +02:00
Rainer Gerhards
38e7f7852a reduced sporadic failures during make check
backport from v6
2011-06-30 10:28:09 +02:00
Rainer Gerhards
53957a73fe preparing for 4.6.6 v4.6.6 2011-06-24 08:42:39 +02:00
Rainer Gerhards
86225089f2 bugfix: mutex was invalidly left unlocked during action processing
At least one case where this can occur is during thread shutdown, which
may be initiated by lower activity. In most cases, this is quite
unlikely to happen. However, if it does, data structures may be
corrupted which could lead to fatal failure and segfault. I detected
this via a testbench test, not a user report. But I assume that some
users may have had unreproducable aborts that were cause by this bug.
v5.8.2
2011-06-21 12:35:14 +02:00
Rainer Gerhards
de33ec026e preparing for 5.8.2 2011-06-21 10:03:47 +02:00
Rainer Gerhards
9fcc6b7285 testbench: added new tests for failover cases 2011-06-20 15:57:15 +02:00
Rainer Gerhards
656740b663 bugfix: problems in failover action handling
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254
2011-06-20 15:01:11 +02:00
Rainer Gerhards
b3dae5cff3 Merge branch 'v4-stable' into v5-stable 2011-06-16 18:02:13 +02:00
Rainer Gerhards
3135b3335d Merge branch 'v3-stable' into v4-stable
Conflicts:
	runtime/datetime.c
2011-06-16 17:53:29 +02:00
Rainer Gerhards
257b06aac8 failover problem was not totally solved, now (hopefully ;))
I overlooked a border case, which came up on a larger testbench run.
2011-06-16 17:52:16 +02:00
Rainer Gerhards
da52cbae52 bugfix: timestamp was incorrectly calculated for timezones with minute offset
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
2011-06-16 17:35:45 +02:00
Rainer Gerhards
90f8c73004 bugfix: problems in failover action handling
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
2011-06-16 15:17:48 +02:00
Rainer Gerhards
1b9dffd550 Merge branch 'v4-stable' into v5-stable
Conflicts:
	doc/rsyslog_conf_global.html
2011-06-15 12:21:36 +02:00
Rainer Gerhards
41d8672524 bugfix/improvement:$WorkDirectory now gracefully handles trailing slashes 2011-06-15 12:20:12 +02:00
Rainer Gerhards
a201de795a doc: clarified requirements for $WorkDirectory directive 2011-06-15 12:02:39 +02:00
Rainer Gerhards
28af40670e Merge branch 'v4-stable' into v5-stable
Conflicts:
	tcpsrv.c
2011-06-14 14:10:52 +02:00
Rainer Gerhards
bcd956d4d5 bugfix: memory leak in imtcp & subsystems under some circumstances
This leak is tied to error conditions which lead to incorrect cleanup
of some data structures. [backport from v6, limited testing under v4]
2011-06-14 12:52:02 +02:00
Rainer Gerhards
fdc25fb14b bugfix: TLS-induced smaller memory still existed, now fixed 2011-06-14 12:23:33 +02:00
Rainer Gerhards
f50f24a775 backporting TLS-based test 2011-06-14 12:18:39 +02:00
Rainer Gerhards
d590684615 backported current tcpflood testing tool
so that we can improve v5's testbench as well
2011-06-14 11:47:17 +02:00
Rainer Gerhards
2c81df12bc bugfix: memory leak in imtcp & subsystems under some circumstances
This leak is tied to error conditions which lead to incorrect cleanup
of some data structures.

Note: this is a backport from v6. In v5, we currently do not have
the toolchain to verify the original problem and that it is solved.
So this patch is preliminary and subject to change as work progresses.
2011-06-10 22:50:25 +02:00
Rainer Gerhards
2b5a7f10f5 somewhat improved debug logging 2011-06-10 19:49:42 +02:00
Rainer Gerhards
1d86889922 Merge branch 'v4-stable' into v5-stable 2011-05-20 11:36:22 +02:00
Rainer Gerhards
f847c2dda3 cleanup: removed useless & undocumented config directive from imrelp 2011-05-20 11:35:26 +02:00
Rainer Gerhards
c399118345 preparing for 5.8.1 stable v5.8.1 2011-05-19 12:44:28 +02:00
Rainer Gerhards
8ca5c6b27f omlibdbi: added necessary include 2011-05-12 02:00:13 +02:00
Rainer Gerhards
687aaaab17 mmsnmptrapd: removed unnecessary includes 2011-05-12 01:58:46 +02:00
Rainer Gerhards
96ac7824cd doc: added merged important patch to ChangeLog 2011-05-11 11:56:40 +02:00
Rainer Gerhards
40b342cfad minor: made diagtalker output more clear
prevents confusion during testbench run
2011-05-11 11:47:23 +02:00
Rainer Gerhards
28551c791b Merge branch 'v4-stable' into v5-stable
Conflicts:
	runtime/queue.c
2011-05-11 10:41:52 +02:00
Rainer Gerhards
cdae37d737 bugfix: invalid processing in QUEUE_FULL condition
If the the multi-submit interface was used and a QUEUE_FULL condition
occured, the failed message was properly destructed. However, the
rest of the input batch, if it existed, was not processed. So this
lead to potential loss of messages and a memory leak. The potential
loss of messages was IMHO minor, because they would have been dropped
in most cases due to the queue remaining full, but very few lucky ones
from the batch may have made it. Anyhow, this has now been changed so
that the rest of the batch is properly tried to be enqueued and, if
not possible, destructed.
2011-05-11 10:15:24 +02:00
Rainer Gerhards
44dab25c55 undo accidental removal of a component 2011-05-10 09:24:48 +02:00
Rainer Gerhards
3c740a9c52 Merge branch 'v5-stable-snmptrapd' into v5-stable 2011-05-10 09:08:46 +02:00
Rainer Gerhards
e8a71cd0d6 mmsnmptrapd: added doc & mentioned in ChangeLog 2011-05-10 09:04:23 +02:00
Rainer Gerhards
87a01476e2 Merge branch 'v4-stable' into v5-stable 2011-05-09 14:39:54 +02:00
Rainer Gerhards
831ce25230 bugfix: invalid storage type for config variables 2011-05-09 12:29:07 +02:00
Tomas Heinrich
816ab51f4b bugfix: stream driver mode was not correctly set on tcp ouput on big endian systems.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-05-09 12:24:14 +02:00