3628 Commits

Author SHA1 Message Date
Rainer Gerhards
4eadfb6481 first shot at scoping (for actions only)
parser now supports $Begin action, $End action, $StrictScoping,
but not yet the actual semantics.
2010-07-23 15:22:47 +02:00
Rainer Gerhards
e64cd21243 moving towards scoping inside rsyslog.conf
first step: adding object-type specifier to config statement table
2010-07-21 18:08:19 +02:00
Rainer Gerhards
490518ae18 preparing for 5.5.6 release v5.5.6 2010-07-21 14:46:10 +02:00
Rainer Gerhards
73ebadd598 added new parser modules
most importantly pmlastmsg, which handles the pathetic "last message
repeated n times" messages that some syslogd's emit.
Also some minor fixes, like wrong files names in make dist (for new
files introduced after last release)
2010-07-13 16:15:02 +02:00
Rainer Gerhards
824a4b98d5 fix: pmrfc3164 did not load because modInit was not specified
... in the proper way for a non.builtin module.
2010-07-09 14:41:38 +02:00
Rainer Gerhards
d4fe3d1389 added new pm3164sd parser module
this permits to accept RFC5424 structured data from messages
with RFC3164 header. This was compiled from existing modules by
user izotov.
2010-07-07 15:48:01 +02:00
Rainer Gerhards
707df8c161 bumped version number 2010-07-07 12:05:06 +02:00
Rainer Gerhards
a71ce0f8b1 preparing for 4.6.3 v4.6.3 2010-07-07 12:01:57 +02:00
Rainer Gerhards
b2418812cf Merge branch 'v5-stable' into master
Conflicts:
	ChangeLog
	Makefile.am
2010-07-05 15:19:51 +02:00
Rainer Gerhards
d9a82205ff Merge branch 'v4-stable' into tmp
Conflicts:
	ChangeLog
	Makefile.am
	tests/Makefile.am
2010-07-05 15:14:36 +02:00
Rainer Gerhards
45b4f3fac9 Merge branch 'v4-devel' 2010-07-05 14:46:47 +02:00
Rainer Gerhards
650f537761 Merge branch 'v4-stable' into v4-devel 2010-07-05 14:44:11 +02:00
varmojfekoj
9de526eccd bugfix: segfault on HUP when "HUPIsRestart" was set to "on"
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-07-05 14:41:32 +02:00
Rainer Gerhards
23d6a4f3fe Merge branch 'tmp' into concurrent-output 2010-06-24 14:06:55 +02:00
Rainer Gerhards
6e093aa326 made hardcoded max string number persistent
see commit for reasoning
2010-06-24 14:05:00 +02:00
Rainer Gerhards
0d721450eb added missing support for systems without atomic instructions 2010-06-24 14:01:05 +02:00
Rainer Gerhards
31fae7b93d bugfix: "$ActionExecOnlyWhenPreviousIsSuspended on" was broken
Note that, as it looks, the directive was already broken in previous v5 versions.
So while I solved what looked like a (intentional) regression from the
performance tuning, I actually solved a previous regression as well ;)

I have also added new test cases to the testbench in order to capture such
problems in the future. This version does now look pretty good in shape.
2010-06-24 12:13:48 +02:00
Rainer Gerhards
f48128f34a fixed a couple of regressions
by implementing some code that was missing so far ;) as well as
finding some real bugs. I also did some general cleanup, removing
debug strings and such. This code should be fairly OK to use, except
when "exec only when previous action was suspended" is used -- this is
NOT yet re-implemented in the tuned engine.
2010-06-23 12:48:27 +02:00
Rainer Gerhards
d6a3b08f56 fixed problem in action message induced failure handling 2010-06-21 12:43:44 +02:00
Rainer Gerhards
dc653ed74f minor cleanup 2010-06-21 11:53:52 +02:00
Rainer Gerhards
0577f7f182 fixed a problem with ACT_MESSAGE_PASSING type of doAction interface 2010-06-15 14:55:09 +02:00
Rainer Gerhards
802f6d8a8f milestone(BUGGY): batch now pushed down to action
at least in important cases (not for non-direct action queues and some
other minor things). This version is definitely buggy, but may be tried
with success on a non-production system. I will continue to work on the
correctness, but needed to commit now to get a baseline.
2010-06-15 14:02:34 +02:00
Rainer Gerhards
fe8d317c1b milestone commit(BUGGY): batch is now handed down to rule processing
Now, the full batch is passed down to the rule, which then enqueues
the elements as single messages. Note that this code has some known
defects and needs more changes until it is correct again. This is
primarily a commit to be able to return to a known-(somewhat)-good
state.
2010-06-10 14:36:49 +02:00
Rainer Gerhards
74135da959 some cleanup
as well as some work in preparation of storing doAction params inside
the batch
2010-06-10 12:24:22 +02:00
Rainer Gerhards
13b5c6b145 fixed regression for omruleset use case
I did not revert to using the action ppMsg data element, as one of the
next steps is to remove it by an overall much better solution.
2010-06-10 10:40:04 +02:00
Rainer Gerhards
d630bc742f Merge branch 'concurrent-output' into tmp 2010-06-10 10:18:59 +02:00
Rainer Gerhards
559cb84a79 fixing msg duplication & loss regression, causes slowdown
messages could get lost or be duplicated due to non-proper sync
of transactions. This is a notable slowdown again, but we know
how to get back concurrency, it just takes "some" more programming.
It is important now to come back to correct code, so that we can
base further improvements on that.
2010-06-10 10:17:04 +02:00
Rainer Gerhards
8fbcea4837 main msg q consumer now preprocesses messages before doing rule processing
things like ACL check and message parsing. This leads to a greater level
of concurrent processing. Beware, though, that this commit duplicates
some messages. May be a regression from this or an earlier commit. I will
soon sort out.
2010-06-09 15:37:00 +02:00
Rainer Gerhards
395660f462 somewhat improved direct mode queue performance
... but only for batch enqueues. This will not help much with
the current code, but will play well with upcoming changes.
2010-06-09 14:34:35 +02:00
Rainer Gerhards
11bd517465 added support for high-performance action queue submission if not all mark messages should be logged
this was previously not properly handeld. This is also the first occurence of
a (real) CAS loop inside rsyslog. Note that the performance is now very well
in the default configuration, and mark message directives are still correctly
being handled. So this code looks close to final, but needs to have some
bug cleanup as the testsuite shows.
2010-06-08 15:20:33 +02:00
Rainer Gerhards
3e49a1075a performance enhancement: implemented stage 1 firehose mode for actions
... plus some other tests, namely string generation in parallel to action
processing. The code is not yet solid and not fully compatible to
older versions. But it is good enough for an early commit and some
early testing/gaining of experience.

The optimization was done based on the fine-grained partitioning
paradigm worked on the past couple of weeks -- seems to work out
really great :)
2010-06-08 12:46:24 +02:00
Rainer Gerhards
220c57e7eb bugfix: regression caused more locking action in msg.c than necessary
also: bugfix: mutexes used to similate atomic instructions were not destructed
2010-06-08 08:25:56 +02:00
Rainer Gerhards
d9e64c16e5 finshed implementation of strgen modules
and also provided four build-in modules for the most common use
cases, hopefully resulting in a speedup of around 5% for typical
rsyslog processing.
2010-06-04 12:45:31 +02:00
Rainer Gerhards
527bfcea5c first implementation of strgen interface
and a first built-in strgen module. Some tweaks and more default strgens
are needed, but the code doesn't look too bad ;)
2010-06-01 18:51:55 +02:00
Rainer Gerhards
59227a8618 experimental commit: facility to generate template via C function
This was a test done to try to generate templates with C code, via
a new (potentially to-be-implemented) class of template modules. We have
a rough POC inside this code, and it showed around 5% or better speedup. So
it semms worth continuing in this direction.

Note that this experimental commit works correct, but does any
template in the form of

$template tpl,=somewhat

will lead to fixed template expansion based on the default file format.
2010-06-01 13:53:12 +02:00
Rainer Gerhards
4b906fe9cf Merge branch 'v4-devel' 2010-05-20 16:46:56 +02:00
Rainer Gerhards
1bac66db05 Merge branch 'v4-stable' into v4-devel
Conflicts:
	ChangeLog
2010-05-20 16:45:41 +02:00
Rainer Gerhards
fcb747c57d some doc fixes; incorrect config samples could cause confusion
thanks to Anthony Edwards for pointing the problems out
2010-05-20 16:43:46 +02:00
Rainer Gerhards
d9bec41238 project status update 2010-05-20 16:34:32 +02:00
Rainer Gerhards
035133028d fixed typo in doc 2010-05-20 16:32:42 +02:00
Rainer Gerhards
128cf1b5e5 preparing for 5.5.5 v5.5.5 2010-05-20 15:40:45 +02:00
Rainer Gerhards
7574e70df4 fixed race conditions during queue shutdown (DA case, disks active) 2010-05-18 17:53:12 +02:00
Rainer Gerhards
af8582e509 added new cancel-reduced action thread termination method
We now manage to cancel threads that block inside a retry loop to
terminate without the need to cancel the thread. Avoiding cancellation
helps keep the system complexity minimal and thus provides for better
stability. This also solves some issues with improper shutdown when
inside an action retry loop.
2010-05-17 14:24:27 +02:00
Rainer Gerhards
74f8bf1465 some more cleanup and a nasty little bug i doDie() 2010-05-10 15:37:44 +02:00
Rainer Gerhards
2da019bfca small cleanup 2010-05-10 15:12:46 +02:00
Rainer Gerhards
e8fafeadb8 made ompgsql identify its version on load 2010-05-07 13:23:04 +02:00
Rainer Gerhards
5ab54ee0fb improved syncdemo tool - added "partition" mode...
... and also analyzed the resulting assembly code to find out
weak spots for the test. Explanations and new suggestions added.
2010-05-05 17:47:57 +02:00
Rainer Gerhards
a9f0f6478f updating project status 2010-05-03 15:05:34 +02:00
Rainer Gerhards
aa31459b15 Merge branch 'v4-devel'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
v5.5.4
2010-05-03 14:48:24 +02:00
Rainer Gerhards
1ab2bb26d2 preparing for 4.7.2 v4.7.2 2010-05-03 12:52:38 +02:00