diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-07 18:55:13 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-07 18:55:13 +0100 |
commit | f813c01258ec5ef3adc8f4790c5c743c2f4b462a (patch) | |
tree | 2d75cf242cb7aa270f3566c55a42974049855845 | |
parent | 36899ac8c40e78767ba58e440167a76dd4a73db1 (diff) | |
download | rsyslog-f813c01258ec5ef3adc8f4790c5c743c2f4b462a.tar.gz rsyslog-f813c01258ec5ef3adc8f4790c5c743c2f4b462a.tar.xz rsyslog-f813c01258ec5ef3adc8f4790c5c743c2f4b462a.zip |
bugfix: discard action did not work under some circumstances
fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | action.c | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,7 @@ --------------------------------------------------------------------------- Version 5.7.8 [V5-BETA] (rgerhards), 2011-03-?? +- bugfix: discard action did not work under some circumstances + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217 - bugfix: file descriptor leak in gnutls netstream driver fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=222 --------------------------------------------------------------------------- @@ -1481,7 +1481,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)); } } |