summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-19 09:41:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-19 09:41:45 +0200
commit90e8475260cf8ac54519b3d964d879489af879f6 (patch)
treecf072344f5a41b2485f6ad320c408d4f5fe0d903 /tools/syslogd.c
parenta4344f350151cdb9172897709fa08680ec8587ba (diff)
downloadrsyslog-90e8475260cf8ac54519b3d964d879489af879f6.tar.gz
rsyslog-90e8475260cf8ac54519b3d964d879489af879f6.tar.xz
rsyslog-90e8475260cf8ac54519b3d964d879489af879f6.zip
bugfix: message processing states were not set correctly in all cases
however, this had no negative effect, as the message processing state was not evaluated when a batch was deleted, and that was the only case where the state could be wrong.
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r--tools/syslogd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 1c494dea..f8a78343 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -641,6 +641,7 @@ msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch, int *pbShu
int i;
msg_t *pMsg;
DEFiRet;
+ rsRetVal localRet;
assert(pBatch != NULL);
@@ -650,7 +651,11 @@ msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch, int *pbShu
if((pMsg->msgFlags & NEEDS_PARSING) != 0) {
parseMsg(pMsg);
}
+ localRet =
ruleset.ProcessMsg(pMsg);
+dbgprintf("msgConsumer got iRet %d from ProcessMsg\n", localRet);
+ /* if we reach this point, the message is considered committed (by definition!) */
+ pBatch->pElem[i].state = BATCH_STATE_COMM;
}
RETiRet;