diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:25:59 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:25:59 +0100 |
| commit | fdcf69caf9754a2d7464856fb90e634a6be9d65e (patch) | |
| tree | c89c6650af3170d9a92831132bd99d75fb511cf8 /action.c | |
| parent | cca05921dcfab557a4743a56c78683e4c1113e2a (diff) | |
| parent | c129ddcc637875442dbf9e0869f5eafbd08199ae (diff) | |
| download | rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.tar.gz rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.tar.xz rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
configure.ac
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1581,7 +1581,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); } } @@ -1623,7 +1624,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; } @@ -1635,7 +1636,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) { |