summaryrefslogtreecommitdiffstats
path: root/runtime/ruleset.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable'Rainer Gerhards2012-08-251-5/+4
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-251-5/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| | * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-5/+4
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c
| | | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-181-5/+5
| | |\| | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c
* | | | added --enable-debugless configure option for very high demanding environmentsRainer Gerhards2012-05-291-9/+8
|/ / / | | | | | | | | | | | | This actually at compile time disables a lot of debug code, resulting in some speedup (but serious loss of debugging capabilities)
* | | Merge branch 'v6-stable'Rainer Gerhards2012-04-181-5/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h
| * | bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-181-5/+5
| | | | | | | | | | | | | | | | | | This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages stored inside the disk queue.
* | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-1/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
| * | stats: added unique (and friendly) name for ruleset queuesRainer Gerhards2012-01-311-1/+4
| |/
* | bugfix: rsyslog aborted during startup if there is an error in loading an actionRainer Gerhards2012-01-271-1/+1
| | | | | | | | and legacy configuration mode is used
* | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
| * | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-2/+2
| | | | | | | | | | | | The most common files are now changed, more needs to be done.
* | | more cleanupRainer Gerhards2011-07-151-2/+2
| | |
* | | some more work was required on the ruleset modificationRainer Gerhards2011-04-191-25/+32
| | |
* | | milestone: ruleset now supports rsconf_tRainer Gerhards2011-04-191-41/+38
|/ /
* | Merge branch 'v5-devel'Rainer Gerhards2011-04-121-2/+2
|\| | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c
| * cleanup: initially thought temporary debug message made durable ;)Rainer Gerhards2011-04-121-2/+2
| | | | | | | | | | It has proven to be very valuable, so now it is properly formatted inside the source.
* | Merge branch 'v5-beta'Rainer Gerhards2011-02-251-9/+14
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * bugfix: fixed a memory leak and potential abort conditionRainer Gerhards2011-02-251-9/+14
| | | | | | | | | | | | | | 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
* | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-211-2/+2
|/ | | | first step: adding object-type specifier to config statement table
* Merge branch 'v4-devel'Rainer Gerhards2010-07-051-0/+1
|\
| * bugfix: segfault on HUP when "HUPIsRestart" was set to "on"varmojfekoj2010-07-051-0/+1
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | bugfix: "$ActionExecOnlyWhenPreviousIsSuspended on" was brokenRainer Gerhards2010-06-241-0/+1
| | | | | | | | | | | | | | | | | | 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.
* | fixed a couple of regressionsRainer Gerhards2010-06-231-11/+0
| | | | | | | | | | | | | | | | 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.
* | milestone(BUGGY): batch now pushed down to actionRainer Gerhards2010-06-151-7/+68
| | | | | | | | | | | | | | 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.
* | milestone commit(BUGGY): batch is now handed down to rule processingRainer Gerhards2010-06-101-12/+27
| | | | | | | | | | | | | | | | 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.
* | first complete implementation of loadable parser systemRainer Gerhards2009-11-041-0/+3
| | | | | | | | | | | | | | I have now done the necessary cleanup. Looks like everything is in place. Unfortunately, I do not yet have any actual parser that is not built-in, but I think we can postpone working on that when the first one appears. I don't expect troubles in that case, but you never know ;)
* | added $RulesetParser config directiveRainer Gerhards2009-11-041-2/+46
| | | | | | | | | | The implementation is now almost done and works, including doc. I now need to verify shutdown, guess there are some resource leaks left...
* | moved rfc3164/5424 code to new parser modulesRainer Gerhards2009-11-041-0/+12
| | | | | | | | | | | | another milestone commit: the program works, the new interface is used, some more cleanup is needed and the per-ruleset config options are still missing. But we are getting closer...
* | added omruleset output module, which provides great flexibility in action ↵Rainer Gerhards2009-11-021-0/+3
| | | | | | | | | | | | processing. THIS IS A VERY IMPORTANT ADDITION, see its doc for why.
* | added the capability to have ruleset-specific main message queuesRainer Gerhards2009-10-271-0/+54
| | | | | | | | | | This offers considerable additional flexibility AND superior performance (in cases where multiple inputs now can avoid lock contention)
* | bugfix: message processing states were not set correctly in all casesRainer Gerhards2009-10-191-0/+2
| | | | | | | | | | | | 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.
* | added multi-ruleset support to imudpRainer Gerhards2009-10-131-6/+1
| | | | | | | | | | also bumped version number and corrected ChangeLog, where I merged some post 5.3.1 changes into the 5.3.1 section.
* | reduced number of debug messages a bit againRainer Gerhards2009-08-261-2/+0
| |
* | bugfix: discard action did not work (did not discard messages)Rainer Gerhards2009-07-301-3/+8
|/
* restored repeated message reduction processingRainer Gerhards2009-06-231-5/+2
|
* completed multi-ruleset core supportRainer Gerhards2009-06-121-2/+82
| | | | ... as well as added multi-ruleset support for imtcp
* implemented $OMFileFlushOnTXEnd directiveRainer Gerhards2009-06-121-3/+6
| | | | plus some cleanup...
* re-enabled queue disk fsync testRainer Gerhards2009-06-101-1/+0
| | | | | | ... actually, it was not broken, but just very slow. I have now reduced the number of test messages so that make check will not be held for an extended period of time.
* restructered code in perparation for multiple rule set supportRainer Gerhards2009-06-101-0/+369
... this was long overdue, and I finlly tackeld it. It turned out to be more complex than I initially thought. The next step now probably is to actually implement multiple rule sets and the beauty that comes with them.