diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-25 15:21:30 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-25 15:21:30 +0200 |
| commit | 9edcc0b6b286b2e0223d32fd7fd6bd66a405f2eb (patch) | |
| tree | f26cc7c18ec628e0bf2e3273d584c23706da09fa /runtime/ruleset.c | |
| parent | 2c23afa623ce0dd8ddb17b1d11bd2962589b0eb9 (diff) | |
| parent | d397bb25265b8b0926af050c4187cfbc5ab074ca (diff) | |
| download | rsyslog-9edcc0b6b286b2e0223d32fd7fd6bd66a405f2eb.tar.gz rsyslog-9edcc0b6b286b2e0223d32fd7fd6bd66a405f2eb.tar.bz2 rsyslog-9edcc0b6b286b2e0223d32fd7fd6bd66a405f2eb.zip | |
Merge branch 'master' into master-newruleset
Conflicts:
runtime/modules.c
Diffstat (limited to 'runtime/ruleset.c')
| -rw-r--r-- | runtime/ruleset.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c index adbce731..2af44bc4 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -48,6 +48,7 @@ #include "action.h" #include "rainerscript.h" #include "srUtils.h" +#include "modules.h" #include "dirty.h" /* for main ruleset queue creation */ /* static data */ @@ -217,7 +218,7 @@ static rsRetVal execAct(struct cnfstmt *stmt, batch_t *pBatch, sbool *active) { DEFiRet; -dbgprintf("RRRR: execAct: batch of %d elements, active %p\n", batchNumMsgs(pBatch), active); +dbgprintf("RRRR: execAct [%s]: batch of %d elements, active %p\n", modGetName(stmt->d.act->pMod), batchNumMsgs(pBatch), active); pBatch->active = active; stmt->d.act->submitToActQ(stmt->d.act, pBatch); RETiRet; |