summaryrefslogtreecommitdiffstats
path: root/action.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-191-1/+1
|\
| * bugfix: potential abort, if action queue could not be properly startedRainer Gerhards2012-09-191-1/+1
| | | | | | | | This most importantly could happen due to configuration errors.
* | add OMSR_TPL_AS_JSON mode for output modules (interface only)Rainer Gerhards2012-08-291-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-moduleRainer Gerhards2012-06-291-2/+0
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h
| * cleanup: remove config scoping system left-overRainer Gerhards2012-06-271-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 worksRainer Gerhards2012-06-211-0/+1
|/ | | | some nits to iron out, only omfile actually support module params
* refactor: remove very old sync.[ch] system for "abstracting" mutex accessRainer Gerhards2012-01-191-2/+1
| | | | This was a bad idea that never was used much.
* Merge branch 'v5-stable' into masterRainer Gerhards2012-01-181-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-stableRainer Gerhards2012-01-141-16/+16
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | * some more files to ASL 2.0Rainer Gerhards2012-01-111-16/+16
| | |
* | | Merge branch 'v5-devel'Rainer Gerhards2011-12-191-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | additional counter for lost messages due to failed actions addedRainer Gerhards2011-12-191-0/+1
| | | |
| * | | added instrumentationRainer Gerhards2011-12-191-0/+3
| |/ /
* | | milestone: generic action parameters parsed via new config systemRainer Gerhards2011-08-011-1/+1
| | |
* | | milestone: queue object now has a param handler for new conf interfaceRainer Gerhards2011-07-221-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 pointRainer Gerhards2011-07-201-0/+1
| | |
* | | Merge branch 'beta'Rainer Gerhards2011-06-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-211-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
| | * | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-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 systemRainer Gerhards2011-05-031-0/+1
|/ / /
* | | Merge branch 'v5-devel'Rainer Gerhards2011-03-311-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-betaRainer Gerhards2011-03-161-18/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | fixed a regression of last patch and some cleanupRainer Gerhards2011-03-161-1/+1
| | | |
| | * | bugfix: failover did not work correctly if repeated msg reduction was onRainer Gerhards2011-03-161-18/+1
| | | | | | | | | | | | | | | | affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-181-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c
| * | | bugfix: minor race condition in action.c - considered cosmeticRainer Gerhards2011-02-171-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 Gerhards2010-07-231-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 instructionsRainer Gerhards2010-06-241-0/+1
| |
* | fixed a couple of regressionsRainer Gerhards2010-06-231-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 cleanupRainer Gerhards2010-06-101-2/+0
| | | | | | | | | | as well as some work in preparation of storing doAction params inside the batch
* | fixed regression for omruleset use caseRainer Gerhards2010-06-101-1/+1
| | | | | | | | | | 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.
* | added support for high-performance action queue submission if not all mark ↵Rainer Gerhards2010-06-081-3/+3
| | | | | | | | | | | | | | | | | | | | 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.
* | performance enhancement: implemented stage 1 firehose mode for actionsRainer Gerhards2010-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | ... 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 :)
* | added new cancel-reduced action thread termination methodRainer Gerhards2010-05-171-0/+1
| | | | | | | | | | | | | | | | 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.
* | adapted merged code to v5 engineRainer Gerhards2010-04-261-1/+1
| |
* | Merge branch 'v5-stable'Rainer Gerhards2010-04-261-1/+2
|\ \
| * | bugfix(kind of): output plugin retry behaviour could cause engine to loopRainer Gerhards2010-04-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The rsyslog engine did not guard itself against output modules that do not properly convey back the tryResume() behaviour. This then leads to what looks like an endless loop. I consider this to be a bug of the engine not only because it should be hardened against plugin misbehaviour, but also because plugins may not be totally able to avoid this situation (depending on the type of and processing done by the plugin).
* | | Merge branch 'v4-devel' into masterRainer Gerhards2010-04-231-1/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: runtime/rsyslog.h runtime/wtp.c
| * | solved alignment errors on Solaris SparcRainer Gerhards2010-04-221-1/+2
| | |
* | | replaced data type "bool" by "sbool" because this created some portability ↵Rainer Gerhards2010-02-021-3/+3
| |/ |/| | | | | issues
* | added omruleset output module, which provides great flexibility in action ↵Rainer Gerhards2009-11-021-1/+1
| | | | | | | | | | | | processing. THIS IS A VERY IMPORTANT ADDITION, see its doc for why.
* | some more cleanup - action config line handlers are now defined in action.cRainer Gerhards2009-10-271-1/+0
| | | | | | | | As an artifact of early development, they were registered in syslogd.c
* | added new config option $ActionWriteAllMarkMessagesRainer Gerhards2009-08-201-0/+1
| | | | | | | | | | | | this option permites to process mark messages under all circumstances, even if an action was recently called. This can be useful to use mark messages as a kind of heartbeat.
* | some post-merge cleanupRainer Gerhards2009-06-221-2/+0
| |
* | Merge branch 'omfile' into tmpRainer Gerhards2009-06-221-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a complex manual merge, especially in action.c. So if there occur some problems, this would be a good point to start troubleshooting. I run a couple of tests before commiting and they all went well. Conflicts: action.c action.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h
| * optimized template string generationRainer Gerhards2009-06-191-0/+1
| |
| * optimized action.c a bitRainer Gerhards2009-06-191-5/+6
| |
* | Merge branch 'master' into multi-dequeueRainer Gerhards2009-05-121-0/+1
|\| | | | | | | | | Conflicts: runtime/rsyslog.h
| * added capability to draw configuration graphsRainer Gerhards2009-05-111-0/+1
| | | | | | | | | | | | | | | | - added $GenerateConfigGraph configuration command which can be used to generate nice-looking (and very informative) rsyslog configuration graphs. - added $ActionName configuration directive (currently only used for graph generation, but may find other uses)
* | first shot at action state machine implemention (untested)Rainer Gerhards2009-05-071-2/+13
|/ | | | | I am commiting it so that the code is visible, but will no begin with the test environment.