| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v7-devel' into tmp | Rainer Gerhards | 2013-11-29 | 1 | -4/+5 |
| |\ | | | | | | | | | Conflicts: action.c | ||||
| | * | actions now report if they suspend and resume themselves | Rainer Gerhards | 2013-11-29 | 1 | -4/+2 |
| | | | |||||
| | * | add new impstats action counters: | Rainer Gerhards | 2013-11-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | * suspended * suspended.duration * resumed | ||||
| * | | refactor action disabling | Rainer Gerhards | 2013-11-06 | 1 | -1/+2 |
| | | | |||||
| * | | enforce that actions can no longer "do something" on action creation | Rainer Gerhards | 2013-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | This doesn't play well with config load/priv drop and was not strictly enforced in v7. | ||||
| * | | refactor: move pbShutdownImmediate to wti_t | Rainer Gerhards | 2013-11-05 | 1 | -1/+1 |
| | | | |||||
| * | | push bShutdownImmediate ptr down to commit process | Rainer Gerhards | 2013-11-04 | 1 | -1/+1 |
| | | | |||||
| * | | experimentally split ruleset execution in exec and commit phase | Rainer Gerhards | 2013-11-04 | 1 | -1/+1 |
| | | | |||||
| * | | refactor: move batch "unrolling" up one layer | Rainer Gerhards | 2013-11-04 | 1 | -1/+2 |
| | | | |||||
| * | | refactor: move action resume retry counter to wti_t | Rainer Gerhards | 2013-11-01 | 1 | -2/+1 |
| | | | |||||
| * | | refactor: move handling too-frequent tryResume == OK to wti_t | Rainer Gerhards | 2013-11-01 | 1 | -1/+0 |
| | | | |||||
| * | | refactor: move action state to wti (as we are now on a per-thread basis) | Rainer Gerhards | 2013-11-01 | 1 | -11/+1 |
| | | | |||||
| * | | milestone: action mutex removed | Rainer Gerhards | 2013-10-29 | 1 | -1/+0 |
| | | | | | | | | | | | This means actions may now be called concurrently and must make provisions themselves to handle multi-threading. | ||||
| * | | milestone: calling sequence changed so that wti is passed to many functions | Rainer Gerhards | 2013-10-26 | 1 | -2/+2 |
| | | | |||||
| * | | maintain action ids (actionNbr) | Rainer Gerhards | 2013-10-26 | 1 | -0/+4 |
| |/ | |||||
| * | enable shuffling of crypto parameters down through queue definition | Rainer Gerhards | 2013-05-10 | 1 | -2/+2 |
| | | |||||
| * | optimize: do date() call in template processing only if actually needed | Rainer Gerhards | 2013-01-13 | 1 | -1/+0 |
| | | |||||
| * | queue: change gerenic queue pUsr ptr to be action_t | Rainer Gerhards | 2012-11-03 | 1 | -1/+0 |
| | | | | | | | this was always action_t, but the initial design was more generic. We are making it specific now in order to gain better performance (after all, we did not need the generic engine in the past 8 years...) | ||||
| * | remove "last message repeated n times" from rsyslog output part | Rainer Gerhards | 2012-10-23 | 1 | -9/+2 |
| | | |||||
| * | do "template date call" only when actually needed | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-19 | 1 | -1/+1 |
| |\ | |||||
| | * | bugfix: potential abort, if action queue could not be properly started | Rainer Gerhards | 2012-09-19 | 1 | -1/+1 |
| | | | | | | | | | This most importantly could happen due to configuration errors. | ||||
| * | | add OMSR_TPL_AS_JSON mode for output modules (interface only) | Rainer Gerhards | 2012-08-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | This patch does NOT contain any implementation, this will happen next. Thanks to Miloslav Trmac, who suggested a similar mode, which I based the JSON idea on. | ||||
| * | | Merge branch 'beta' into master-module | Rainer Gerhards | 2012-06-29 | 1 | -2/+0 |
| |\| | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | cleanup: remove config scoping system left-over | Rainer Gerhards | 2012-06-27 | 1 | -2/+0 |
| | | | | | | | | | | | this was an experiment in early v6 that did not work out. I forgot to remove this code when I undid it. | ||||
| * | | milestone: module() config statement basically works | Rainer Gerhards | 2012-06-21 | 1 | -0/+1 |
| |/ | | | | some nits to iron out, only omfile actually support module params | ||||
| * | refactor: remove very old sync.[ch] system for "abstracting" mutex access | Rainer Gerhards | 2012-01-19 | 1 | -2/+1 |
| | | | | | This was a bad idea that never was used much. | ||||
| * | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 1 | -16/+16 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c | ||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 1 | -16/+16 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c | ||||
| | | * | some more files to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -16/+16 |
| | | | | |||||
| * | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 1 | -0/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c | ||||
| | * | | | additional counter for lost messages due to failed actions added | Rainer Gerhards | 2011-12-19 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | added instrumentation | Rainer Gerhards | 2011-12-19 | 1 | -0/+3 |
| | |/ / | |||||
| * | | | milestone: generic action parameters parsed via new config system | Rainer Gerhards | 2011-08-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | ... and action queue defs use this new interface (but not yet the main queues) | ||||
| * | | | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh | ||||
| | * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| | | * | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) | ||||
| * | | | | step: put plumbing in place for new input module config system | Rainer Gerhards | 2011-05-03 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -18/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -18/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | | * | | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | bugfix: failover did not work correctly if repeated msg reduction was on | Rainer Gerhards | 2011-03-16 | 1 | -18/+1 |
| | | | | | | | | | | | | | | | | | affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on | ||||
| * | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | ||||
| | * | | | bugfix: minor race condition in action.c - considered cosmetic | Rainer Gerhards | 2011-02-17 | 1 | -1/+0 |
| | |/ / | | | | | | | | | | | | | | | | This is considered cosmetic as multiple threads tried to write exactly the same value into the same memory location without sync. The method has been changed so this can no longer happen. | ||||
| * / / | added support to save/restore rsyslog core action settings... | Rainer Gerhards | 2010-07-23 | 1 | -0/+2 |
| |/ / | | | | | | | | | ... but not those of plugins (which are at least as important as the core ones). So this is an interim commit. | ||||
| * | | added missing support for systems without atomic instructions | Rainer Gerhards | 2010-06-24 | 1 | -0/+1 |
| | | | |||||
| * | | fixed a couple of regressions | Rainer Gerhards | 2010-06-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | 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. | ||||
| * | | some cleanup | Rainer Gerhards | 2010-06-10 | 1 | -2/+0 |
| | | | | | | | | | | | as well as some work in preparation of storing doAction params inside the batch | ||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |