summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-01-04 16:52:56 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-01-04 16:52:56 +0000
commite41c0854dac685047dba1107b097bf674e740131 (patch)
treeb0257b48b40e707b65a1c3ec02de42d95928b45d /syslogd.c
parent3b8457d1da7f81f9d5c48ff9f1d84cb838942803 (diff)
downloadrsyslog-e41c0854dac685047dba1107b097bf674e740131.tar.gz
rsyslog-e41c0854dac685047dba1107b097bf674e740131.tar.xz
rsyslog-e41c0854dac685047dba1107b097bf674e740131.zip
moved message destruction back to consumer - the consume should decide what
to do with the object. It may pass it on to someone else. So this would have creatd some headache in the future (maybe...).
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/syslogd.c b/syslogd.c
index bb0526c7..13ff8960 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1868,6 +1868,7 @@ msgConsumer(void *pUsr)
assert(pMsg != NULL);
processMsg(pMsg);
+ MsgDestruct(pMsg);
return RS_RET_OK;
}
@@ -2339,12 +2340,6 @@ logmsg(int pri, msg_t *pMsg, int flags)
pMsg->msgFlags = flags;
queueEnqObj(pMsgQueue, (void*) pMsg);
-#if 0
- CHKiRet_Hdlr(queueEnqObj(pMsgQueue, (void*) pMsg)) {
- /* if we have an error return, the pMsg was not destructed */
- MsgDestruct(pMsg);
- }
-#endif
}