diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-16 15:17:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-16 15:17:48 +0200 |
| commit | 90f8c7300495da9b61e4706be652c612fccc084f (patch) | |
| tree | 47c6065cf8f2dcd9cfb6b0059f6a0d613b00cfa7 /runtime | |
| parent | 1b9dffd5501807af9472a12c702aa582b23fca96 (diff) | |
| download | rsyslog-90f8c7300495da9b61e4706be652c612fccc084f.tar.gz rsyslog-90f8c7300495da9b61e4706be652c612fccc084f.tar.xz rsyslog-90f8c7300495da9b61e4706be652c612fccc084f.zip | |
bugfix: problems in failover action handling
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/rule.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/runtime/rule.c b/runtime/rule.c index d5f18e71..19239d61 100644 --- a/runtime/rule.c +++ b/runtime/rule.c @@ -266,6 +266,7 @@ static rsRetVal processBatch(rule_t *pThis, batch_t *pBatch) { int i; + rsRetVal localRet; DEFiRet; ISOBJ_TYPE_assert(pThis, rule); @@ -273,9 +274,14 @@ 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; |