diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 10:24:58 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 10:24:58 +0100 |
| commit | 6c3ef4dacfa0a0fb0099299e30335c788704fe2a (patch) | |
| tree | cb43da8a6fd9508f872059d6dada70ed02348b10 /action.c | |
| parent | cd61ecd459d7ba915ac5b31743e7ded8db62e30e (diff) | |
| parent | fd26a42bdc04eaf497cafd9ef806a54f3de1a7e9 (diff) | |
| download | rsyslog-6c3ef4dacfa0a0fb0099299e30335c788704fe2a.tar.gz rsyslog-6c3ef4dacfa0a0fb0099299e30335c788704fe2a.tar.xz rsyslog-6c3ef4dacfa0a0fb0099299e30335c788704fe2a.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/omlibdbi/omlibdbi.c
tests/Makefile.am
tests/diag.sh
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1487,7 +1487,8 @@ helperSubmitToActionQComplexBatch(action_t *pAction, batch_t *pBatch) DBGPRINTF("Called action(complex case), logging to %s\n", module.GetStateName(pAction->pMod)); for(i = 0 ; i < batchNumMsgs(pBatch) && !*(pBatch->pbShutdownImmediate) ; ++i) { - if(pBatch->pElem[i].bFilterOK) { + if( pBatch->pElem[i].bFilterOK + && pBatch->pElem[i].state != BATCH_STATE_DISC) { doActionCallAction(pAction, (msg_t*)(pBatch->pElem[i].pUsrp)); } } |