diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:47:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:47:16 +0100 |
| commit | 3367446c0abfec6230c9f70277ddc7c7ecbacdf6 (patch) | |
| tree | acc296899eb8da0f5671e04d0234bc10971ac0a4 /action.c | |
| parent | b826c0d3c53bc9da7014d8e75f6e3db8853b7c19 (diff) | |
| parent | 2227515764469d475d42d05ca7384cb227a8dce5 (diff) | |
| download | rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.tar.gz rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.tar.xz rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1654,7 +1654,8 @@ countStatsBatchEnq(action_t *pAction, batch_t *pBatch) { int i; 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) { STATSCOUNTER_INC(pAction->ctrProcessed, pAction->mutCtrProcessed); } } @@ -1696,7 +1697,7 @@ doQueueEnqObjDirectBatch(action_t *pAction, batch_t *pBatch) pBatch->pElem[i].bFilterOK = 0; bModifiedFilter = 1; } - if(pBatch->pElem[i].bFilterOK) { + if(pBatch->pElem[i].bFilterOK && pBatch->pElem[i].state != BATCH_STATE_DISC) { STATSCOUNTER_INC(pAction->ctrProcessed, pAction->mutCtrProcessed); bNeedSubmit = 1; } @@ -1708,7 +1709,7 @@ doQueueEnqObjDirectBatch(action_t *pAction, batch_t *pBatch) /* note: stats were already computed above */ iRet = qqueueEnqObjDirectBatch(pAction->pQueue, pBatch); } else { - DBGPRINTF("no need to submit batch, all bFilterOK==0\n"); + DBGPRINTF("no need to submit batch, all bFilterOK==0 or discarded\n"); } if(bModifiedFilter) { for(i = 0 ; i < batchNumMsgs(pBatch) ; ++i) { |