diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-12 11:10:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-12 11:10:48 +0200 |
| commit | 99f342e866c6c4a257c0a504ce7e561e21458847 (patch) | |
| tree | 76bbc755f42e07a4be51877cebce30eac7d7ece9 /runtime/queue.c | |
| parent | 50abcd483b422e3e4f0b67a925fa8cdf71936f12 (diff) | |
| download | rsyslog-99f342e866c6c4a257c0a504ce7e561e21458847.tar.gz rsyslog-99f342e866c6c4a257c0a504ce7e561e21458847.tar.bz2 rsyslog-99f342e866c6c4a257c0a504ce7e561e21458847.zip | |
new ruleengine: fixed action handling in regard to filters
This was not yet adapted to the new "active" structure.
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index bb9ea060..2108e231 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -976,6 +976,7 @@ static rsRetVal qAddDirect(qqueue_t *pThis, void* pUsr) { batch_t singleBatch; batch_obj_t batchObj; + sbool active = 1; int i; DEFiRet; @@ -994,9 +995,9 @@ static rsRetVal qAddDirect(qqueue_t *pThis, void* pUsr) memset(&singleBatch, 0, sizeof(batch_t)); batchObj.state = BATCH_STATE_RDY; batchObj.pUsrp = (obj_t*) pUsr; - batchObj.bFilterOK = 1; singleBatch.nElem = 1; /* there always is only one in direct mode */ singleBatch.pElem = &batchObj; + singleBatch.active = &active; iRet = pThis->pConsumer(pThis->pUsr, &singleBatch, &pThis->bShutdownImmediate); /* delete the batch string params: TODO: create its own "class" for this */ for(i = 0 ; i < CONF_OMOD_NUMSTRINGS_MAXSIZE ; ++i) { @@ -1596,7 +1597,6 @@ DequeueConsumableElements(qqueue_t *pThis, wti_t *pWti, int *piRemainingQueueSiz /* all well, use this element */ pWti->batch.pElem[nDequeued].pUsrp = pUsr; pWti->batch.pElem[nDequeued].state = BATCH_STATE_RDY; - pWti->batch.pElem[nDequeued].bFilterOK = 1; // TODO: think again if we can handle that with more performance ++nDequeued; } |