2718 Commits

Author SHA1 Message Date
Rainer Gerhards
4578dc6a2d Merge branch 'v4-devel' into tmp 2009-11-05 14:34:21 +01:00
Rainer Gerhards
cd5f653ad8 Merge branch 'v4-beta' into v4-devel
Conflicts:
	tests/Makefile.am
2009-11-05 14:34:08 +01:00
Rainer Gerhards
6a99be4696 added pipe action test to testbench & testbench bugfix 2009-11-05 14:31:37 +01:00
Rainer Gerhards
b41e0d51f5 some more cleanup along the way
... getting the module structure a bit cleaner ;)
2009-11-03 18:48:40 +01:00
Rainer Gerhards
0c721accce Merge branch 'v4-devel' 2009-11-03 09:20:48 +01:00
Rainer Gerhards
e4ca8a3119 added function getenv() to RainerScript 2009-11-03 09:20:02 +01:00
Rainer Gerhards
05d693123b added omruleset output module, which provides great flexibility in action processing.
THIS IS A VERY IMPORTANT ADDITION, see its doc for why.
2009-11-02 11:39:38 +01:00
Rainer Gerhards
037576dcc7 bugfix(testbench): testcase did not properly wait for rsyslod shutdown
thus some unpredictable behavior and a false negative test result
could occur. [BACKPORTED from v5]
2009-10-30 09:06:50 +01:00
Rainer Gerhards
2f02a706a8 bugfix(testbench): testcase did not properly wait for rsyslod shutdown
thus some unpredictable behavior and a false negative test result
could occur.
2009-10-30 08:58:30 +01:00
Rainer Gerhards
7a51d07e94 added test for ruleset-specific main queue 2009-10-30 08:48:55 +01:00
Rainer Gerhards
44057328a6 fix: testbench was broken by recent ruleset queue changes
actually, the runtime dummy was missing some global entities, these
have now been added.
2009-10-30 08:48:05 +01:00
Rainer Gerhards
24cd5aee47 fixed race condition during queue shutdown
Problems could happen if the queue worker needed to be cancelled
and this cancellation happened inside queue-code (including
wtp, wti). We have now solved this by disabling cancellation while
in this code and only enabling it when working inside the user consumer.
This exactly matches the use case for which cancellation may be needed.
2009-10-27 10:00:23 +01:00
Rainer Gerhards
b585a4e909 addressed some race issues during queue shutdown
these occured in very unusual scenarios where we had a DA-queue running
in parallel and very lengthy actions. Then, in some situations, the
shutdown could hang. The code needs some addition lab time, but
is believed to be much better than any previous version.
2009-10-26 18:53:01 +01:00
Rainer Gerhards
da53802c96 implemented solution for cancel at shutdown/unprocessed entries
We do now enqueue those objects that are left unprocessed. This enables
us to delete the full batch, what is exactly what we need to do.
2009-10-26 12:21:07 +01:00
Rainer Gerhards
33e216daf7 Begun to work on partial batch deletes...
... but this brings a lot of problems with it. The issue is that
we still have a sequential store and we do not know how we could
delete the one entry right in the middle of processing. I keep this
branch if we intend to move on with it - but for now I look into a
different solution...
2009-10-22 14:57:34 +02:00
Rainer Gerhards
e04e1b5002 enhanced test environment (including testbench)
support for enhancing probability of memory addressing failure by
using non-NULL default value for malloced memory (optional, only if
requested by configure option). This helps to track down some
otherwise undetected issues within the testbench and is expected
to be very useful in the future.
2009-10-22 11:33:38 +02:00
Rainer Gerhards
9079f66830 improved testbench
- added a test to check handling of damaged .qi files on startup
- made sure each test identifies itself on startup
2009-10-21 15:17:19 +02:00
Rainer Gerhards
d3e5a24143 bugfix (testbench): left-over from manual test removed 2009-10-21 12:38:09 +02:00
Rainer Gerhards
a4e5c7d4cc Merge branch 'newqueue'
Conflicts:
	ChangeLog
	runtime/queue.c
2009-10-21 10:37:52 +02:00
Rainer Gerhards
1bf76e99d6 preparing for 5.3.2 2009-10-21 10:17:44 +02:00
Rainer Gerhards
07264a78e0 added some tests for IPv4-Only configuration
We are "abusing" the parser tests to test the TCP/UDP reception
handling. Thus we do not run the other tests through to an IPv4
only config. It acutally is not that parser that matters but rather
the hope to find some init issues when running with only a single
listening socket (in IPv6, we usually both have an IPv4 AND an IPv6
listening socket, what - as practice has shown - may hide listener
setup errors).
2009-10-20 09:05:48 +02:00
Rainer Gerhards
0acdae34bd streamlined new addition to testbench 2009-10-19 15:36:16 +02:00
Rainer Gerhards
2bf008af08 added new testcase; fixed bug in testdriver 2009-10-19 13:59:42 +02:00
Rainer Gerhards
90e8475260 bugfix: message processing states were not set correctly in all cases
however, this had no negative effect, as the message processing state
was not evaluated when a batch was deleted, and that was the only case
where the state could be wrong.
2009-10-19 09:41:45 +02:00
Rainer Gerhards
73f83d963b Merge branch 'master' into newqueue
Conflicts:
	tools/syslogd.c
2009-10-15 11:57:53 +02:00
Rainer Gerhards
c5408da3d8 new queue engine - initial commit (probably not 100% working!)
simplified and thus speeded up the queue engine, also fixed some
potential race conditions (in very unusual shutdown conditions)
along the way. The threading model has seriously changes, so there may
be some regressions.

NOTE: the code passed basic tests, but there is still more work
and testing to be done. This commit should be treated with care.
2009-10-14 11:01:21 +02:00
Rainer Gerhards
4d70c9b3e5 added some debug settings plus improved shutdown sequence
... non-working version!
2009-10-13 14:38:45 +02:00
Rainer Gerhards
f094fcb261 added one more parser test case 2009-10-09 15:48:32 +02:00
Rainer Gerhards
5625dbd1b6 bugfix and testbench improvements
- bugfix: solved potential (temporary) stall of messages when the queue was
  almost empty and few new data added (caused testbench to sometimes hang!)
- fixed some race condition in testbench
- added more elaborate diagnostics to parts of the testbench
- solved a potential race inside the queue engine
2009-10-07 18:40:30 +02:00
Rainer Gerhards
92ec206279 bugfix and testbench improvement
made shutdown more reliable by makeing sure that the main queue DA worker
is only cancelled if this is actually unavoidable. Also moved down the
deletion of rsyslogd's pid file to immediately before termination, so
that absence of the file is a proper indication that rsyslogd has
finished (in the past, e.g. the testbench accidently ran two intances
as the pid file was deleted too early). Also some improvments to the
testbench, namely to handle aborts more intelligently (but still not
perfect).
2009-10-07 10:53:05 +02:00
Rainer Gerhards
caeb203f51 bugfix: potential race condition when queue worker threads were terminated 2009-10-06 16:22:32 +02:00
Rainer Gerhards
8cd291a0c9 Merge branch 'v4-stable' into v4-beta
Conflicts:
	ChangeLog
	runtime/msg.c
2009-08-27 12:13:01 +02:00
Rainer Gerhards
b3e16a9f53 Merge branch 'v4-stable' into v4-devel
Conflicts:
	ChangeLog
	runtime/msg.c
2009-08-25 15:59:46 +02:00
Rainer Gerhards
03918b4478 bugfix: Java testing tools were required, even if testbench was disabled
This resulted in build errors if no Java was present on the build system,
even though none of the selected option actually required Java.
(I forgot to backport a similar fix to newer releases).
2009-08-24 12:21:28 +02:00
Rainer Gerhards
e22a26ddbf added forgotten testcase 2009-08-20 14:24:51 +02:00
Rainer Gerhards
2f8330f317 Merge branch 'beta' 2009-08-17 14:51:03 +02:00
Rainer Gerhards
aa10f7a164 legacy syslog parser changed so that it now accepts date stamps in wrong case.
Some devices seem to create them and I do not see any harm in supporting that.
2009-08-17 14:44:42 +02:00
Rainer Gerhards
a6bda9b93f bugfix: discard action did not work (did not discard messages) 2009-07-30 11:09:15 +02:00
Rainer Gerhards
feeb622c4e bugfix: discard action caused segfault 2009-07-30 09:47:47 +02:00
Rainer Gerhards
81406f1898 fixed testbench compile problem on some platforms 2009-07-21 10:36:47 +02:00
Rainer Gerhards
cf4e3a4d99 moved check_JAVA as suggested by Michael Biebl - thx 2009-07-20 18:43:38 +02:00
Rainer Gerhards
01acb7928e some more threading changes
... as well as some cleanup
2009-07-20 08:58:03 +02:00
Rainer Gerhards
65a449ded4 Merge branch 'detached' into master
Conflicts:
	tests/nettester.c
2009-07-15 14:30:18 +02:00
Rainer Gerhards
4130ca8670 Merge branch 'v4-devel' 2009-07-09 17:21:01 +02:00
Rainer Gerhards
ab40107149 Merge branch 'v4-beta' into v4-devel
Conflicts:
	tests/nettester.c
2009-07-09 16:35:13 +02:00
Rainer Gerhards
9de685929e bugfix: message could be truncated after TAG, often when forwarding
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.
2009-07-09 16:32:14 +02:00
Rainer Gerhards
4b6e93d382 further reduction in code size/complexity due to design change 2009-07-08 18:45:23 +02:00
Rainer Gerhards
4cfbc7254a simplified worker thread handling
based on now working with detached threads. This is probably the biggest
patch in this series and with large bug potential.
2009-07-08 18:12:05 +02:00
Rainer Gerhards
cf906392c3 Merge branch 'v4-devel'
Conflicts:
	runtime/debug.h
	runtime/stream.c
2009-07-08 15:23:25 +02:00
Rainer Gerhards
26227091fa fixed a bug introduced today that lead to an abort in queue disk mode 2009-07-07 17:18:51 +02:00