3579 Commits

Author SHA1 Message Date
Rainer Gerhards
ce1860a0bc bugfix: failover did not work correctly if repeated msg reduction was on
affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
2011-03-16 14:40:36 +01:00
Rainer Gerhards
9a53ec419e Merge branch 'v4-stable' into v5-stable
Conflicts:
	tests/Makefile.am
	tests/diag.sh
	tests/tcpflood.c
2011-03-11 11:16:41 +01:00
Rainer Gerhards
4195f9cb08 added new test for imfile to testbench 2011-03-11 10:58:07 +01:00
Rainer Gerhards
765317d54e improved tcpflood test tool to support many more connections
even on platforms that place a low limit on the number of
file descriptors per processes. The tool now increases the
fd limit as required.
2011-03-10 15:13:31 +01:00
Rainer Gerhards
dffb2bab8c adding bugfix info to ChangLog (imported fix) 2011-03-09 13:08:32 +01:00
Rainer Gerhards
f2d31917da Merge branch 'v4-stable' into tmp 2011-03-09 13:02:17 +01:00
Rainer Gerhards
c1760db6bb bugfix: omlibdbi did not use password from rsyslog.con
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203
2011-03-09 13:01:57 +01:00
Rainer Gerhards
3866bd51bf bugfix(kind of): tell users that config graph can currently not be generated
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
2011-03-08 18:29:33 +01:00
Rainer Gerhards
97f6fa81fd Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable 2011-03-08 18:18:29 +01:00
Rainer Gerhards
5d3783b0c0 added new test to testbench 2011-03-08 18:18:14 +01:00
Rainer Gerhards
027e6434c9 small bug in testbench, wrong config file pulled in one test 2011-03-07 19:03:02 +01:00
Rainer Gerhards
5709b056c5 changed testbench parser patterns for more usual system config
a problem in the current testbench is that it depends on the locally
assigned system name. We have changed the default to the most common
default value. However, in the long term we need to fix this (and will
do so via a preloaded DNS cache, which we do not yet have!)
2011-03-04 16:33:01 +01:00
Rainer Gerhards
e7ed6c6a94 preparing for 5.6.4 v5.6.4 2011-03-02 14:29:36 +01:00
Rainer Gerhards
8083bd1433 backporting abort condition fix from 5.7.7 2011-03-02 14:10:08 +01:00
Rainer Gerhards
7a75a305ac cosmetic: ChangeLog looks like 5.6.4 was already released, but it is not 2011-02-25 14:57:30 +01:00
Rainer Gerhards
dbf181c3d3 bugfix: fixed a memory leak and potential abort condition
this could happen if multiple rulesets were used and some output batches
contained messages belonging to more than one ruleset.
fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226
fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218
2011-02-25 14:23:25 +01:00
Rainer Gerhards
dfa88369d4 bugfix: memory leak when $RepeatedMsgReduction on was used
bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225
2011-02-25 11:05:57 +01:00
Rainer Gerhards
237df37a86 bugfix: testbench was not activated if no Java was present on system
... what actually was a left-over. Java is no longer required.
2011-02-17 12:42:37 +01:00
Rainer Gerhards
6bad782f15 bugfix: abort if imfile reads file line of more than 64KiB
Thanks to Peter Eisentraut for reporting and analysing this problem.
bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221
2011-02-10 17:54:09 +01:00
Rainer Gerhards
1100fd18b4 preparing for v5.6.3 v5.6.3 2011-01-26 12:54:52 +01:00
Rainer Gerhards
464103820b Merge branch 'v4-stable' into v5-stable 2011-01-26 12:38:02 +01:00
Rainer Gerhards
cdc27aea8f imfile bugfix: potential duplication of log content
Under some circumstances an invalid truncation was detected. This
code has now been removed, a file change (and thus resent) is only
detected if the inode number changes.
2011-01-10 08:22:50 +01:00
Rainer Gerhards
25ff60f523 forgot the actual patch with the last commit :( 2010-12-17 18:34:39 +01:00
Rainer Gerhards
5085587806 bugfix: imfile potentially duplicates lines
This can happen when 0 bytes are read from the input file, and some
writer appends data to the file BEFORE we check if a rollover happens.
The check for rollover uses the inode and size as a criterion. So far,
we checked for equality of sizes, which is not given in this scenario,
but that does not indicate a rollover. From the source code comments:
   Note that when we check the size, we MUST NOT check for equality.
   The reason is that the file may have been written right after we
   did try to read (so the file size has increased). That is NOT in
   indicator of a rollover (this is an actual bug scenario we
   experienced). So we need to check if the new size is smaller than
   what we already have seen!
2010-12-17 18:18:57 +01:00
Rainer Gerhards
2181515805 bug fixes in action processing
- bugfix: action processor released mememory too early, resulting in
  potential issue in retry cases (but very unlikely due to another
  bug, which I also fixed -- only after the fix this problem here
  became actually visible).
- bugfix: batches which had actions in error were not properly retried in
  all cases
2010-12-17 10:43:55 +01:00
Rainer Gerhards
c12fd1e65b used a bit more stack (irrelevant) to gain a bit more performance...
... for large batches
2010-12-16 15:52:15 +01:00
Rainer Gerhards
b9ba5013ad bugfix: batch processing flagged invalid message as "bad" under some circumstances
also fixed some cosmetic nits
2010-12-16 14:23:38 +01:00
Rainer Gerhards
189a26c044 Merge branch 'v4-stable' into v5-stable
Conflicts:
	ChangeLog
	runtime/parser.c
	runtime/queue.c
	runtime/wtp.c
	template.c
	threads.c
	tools/syslogd.c
2010-12-16 13:59:16 +01:00
Rainer Gerhards
c5611012f9 fixed cosmetic nit (as a result of clang static code analyzer run) 2010-12-16 13:41:18 +01:00
Rainer Gerhards
371a8eec29 some cleanup based on clang static analyzer results 2010-12-16 12:57:55 +01:00
Rainer Gerhards
75bfef7fa1 Merge branch 'v3-stable' into v4-stable
Conflicts:
	ChangeLog
2010-12-16 12:21:10 +01:00
Rainer Gerhards
ec6230cffe improved some code based on clang static analyzer results 2010-12-16 12:16:54 +01:00
Rainer Gerhards
7817aa1597 bugfix: unitialized variable could cause issues under extreme conditions
plus some minor nits. This was found after a clang static code analyzer
analysis (great tool, and special thanks to Marcin for telling me about
it!)
2010-12-16 12:02:36 +01:00
Michael Biebl
d2dc913edc typo fix (thanks to Björn Påhlsson for finding it!)
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-11-30 15:48:48 +01:00
Rainer Gerhards
c4026ec0f8 preparing for 5.6.2 v5.6.2 2010-11-30 11:41:40 +01:00
Rainer Gerhards
a3c81f500a bugfix: replacements for atomic operations for non-int sized types had problems.
At least one instance of that problem could potentially lead
to abort (inside omfile).
2010-11-25 17:20:55 +01:00
Chris Metcalf
afafd9e0d7 bugfix: atomic increment for msg object may not work correct on all platforms.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-11-25 15:51:49 +01:00
Rainer Gerhards
64ecd12021 forgot to add to ChangeLog 2010-11-25 15:06:49 +01:00
Rainer Gerhards
775464beaa streamlined epoll_create() code a little bit 2010-11-25 14:52:38 +01:00
David Hill
e4e263243a fixed compile problem in imptcp if no epoll_create1() is present
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-11-25 14:51:02 +01:00
Rainer Gerhards
65c7f46893 Merge branch 'v5.6.0a' into v5-stable
Conflicts:
	configure.ac
2010-11-25 14:47:21 +01:00
Rainer Gerhards
ed2a2fd829 Merge branch 'v4.4.2a' into v4-stable
Conflicts:
	ChangeLog
	configure.ac
	plugins/imfile/imfile.c
	runtime/stream.c
2010-11-25 12:52:24 +01:00
Rainer Gerhards
e4ac19d8ff final cleanup for 5.6.1 v5.6.1 2010-11-24 16:27:14 +01:00
Rainer Gerhards
da8670d37a final preparations for release v4.6.5 2010-11-24 15:57:59 +01:00
Rainer Gerhards
b4da4fdac9 Merge branch 'v4-stable' into v5-stable
Conflicts:
	configure.ac
2010-11-24 12:57:46 +01:00
Rainer Gerhards
600bc06638 Merge branch 'v3-stable' into v4-stable
Conflicts:
	ChangeLog
	configure.ac
2010-11-24 11:25:22 +01:00
Rainer Gerhards
925504d565 bugfix(important): problem in TLS handling could cause rsyslog to loop
... in a tight loop, effectively disabling functionality and bearing the
risk of unresponsiveness of the whole system.
Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
v3.22.3
2010-11-24 11:14:21 +01:00
Rainer Gerhards
c470879eff bugfix: testbench failed if imptcp was not enabled 2010-11-05 12:56:07 +01:00
Rainer Gerhards
7f6b471bf5 provide clear error message if platform does not support imptcp 2010-11-05 11:44:41 +01:00
Rainer Gerhards
cb04fc3972 permitted imptcp to work on systems which support epoll(), but not epoll_create().
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=204
Thanks to Nicholas Brink for reporting this problem.
2010-11-05 11:02:14 +01:00