diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-06-10 10:18:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-06-10 10:18:59 +0200 |
| commit | d630bc742f2f0b6a29c745bba743ecb8a03033c6 (patch) | |
| tree | 4c8a70641fb757808c2fd0cb5a0c257cb2c0eeb6 /runtime/rule.c | |
| parent | 559cb84a79a9848ce1415569158928478991108c (diff) | |
| parent | 8fbcea483710faae468ecf0ba706adc7e60ed41d (diff) | |
| download | rsyslog-d630bc742f2f0b6a29c745bba743ecb8a03033c6.tar.gz rsyslog-d630bc742f2f0b6a29c745bba743ecb8a03033c6.tar.bz2 rsyslog-d630bc742f2f0b6a29c745bba743ecb8a03033c6.zip | |
Merge branch 'concurrent-output' into tmp
Diffstat (limited to 'runtime/rule.c')
| -rw-r--r-- | runtime/rule.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/rule.c b/runtime/rule.c index 65ad071e..3b98d7d1 100644 --- a/runtime/rule.c +++ b/runtime/rule.c @@ -110,7 +110,7 @@ DEFFUNC_llExecFunc(processMsgDoActions) ABORT_FINALIZE(RS_RET_OK); } - iRetMod = actionCallAction(pAction, pDoActData->pMsg); + iRetMod = pAction->submitToActQ(pAction, pDoActData->pMsg); if(iRetMod == RS_RET_DISCARDMSG) { ABORT_FINALIZE(RS_RET_DISCARDMSG); } else if(iRetMod == RS_RET_SUSPENDED) { @@ -166,7 +166,6 @@ shouldProcessThisMessage(rule_t *pRule, msg_t *pMsg, int *bProcessMsg) } } -RUNLOG_VAR("%p", pRule->pCSProgNameComp); if(pRule->pCSProgNameComp != NULL) { int bInv = 0, bEqv = 0, offset = 0; if(*(rsCStrGetSzStrNoNULL(pRule->pCSProgNameComp)) == '-') { |