diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 16:11:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 16:11:58 +0200 |
| commit | 2bd4e10a4dc909346d5a010edefb12c65ed77aec (patch) | |
| tree | 6c32f32c24a71777880249c52b82c58646d74c15 /runtime/rule.c | |
| parent | 42d36fbf3a06bb10e966abe1bcd288d335c6ad18 (diff) | |
| parent | b71ef4abad365f95cf7adf3df14083940d531f1f (diff) | |
| download | rsyslog-2bd4e10a4dc909346d5a010edefb12c65ed77aec.tar.gz rsyslog-2bd4e10a4dc909346d5a010edefb12c65ed77aec.tar.bz2 rsyslog-2bd4e10a4dc909346d5a010edefb12c65ed77aec.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/Makefile.am
tests/manytcp-too-few-tls.sh
Diffstat (limited to 'runtime/rule.c')
| -rw-r--r-- | runtime/rule.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/runtime/rule.c b/runtime/rule.c index d023bcec..3dcee877 100644 --- a/runtime/rule.c +++ b/runtime/rule.c @@ -291,6 +291,7 @@ static rsRetVal processBatch(rule_t *pThis, batch_t *pBatch) { int i; + rsRetVal localRet; DEFiRet; ISOBJ_TYPE_assert(pThis, rule); @@ -298,9 +299,13 @@ processBatch(rule_t *pThis, batch_t *pBatch) /* first check the filters and reset status variables */ for(i = 0 ; i < batchNumMsgs(pBatch) && !*(pBatch->pbShutdownImmediate) ; ++i) { - CHKiRet(shouldProcessThisMessage(pThis, (msg_t*)(pBatch->pElem[i].pUsrp), - &(pBatch->pElem[i].bFilterOK))); - // TODO: really abort on error? 2010-06-10 + localRet = shouldProcessThisMessage(pThis, (msg_t*)(pBatch->pElem[i].pUsrp), + &(pBatch->pElem[i].bFilterOK)); + if(localRet != RS_RET_OK) { + DBGPRINTF("processBatch: iRet %d returned from shouldProcessThisMessage, " + "ignoring message\n", localRet); + pBatch->pElem[i].bFilterOK = 0; + } if(pBatch->pElem[i].bFilterOK) { /* re-init only when actually needed (cache write cost!) */ pBatch->pElem[i].bPrevWasSuspended = 0; |