summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-13 14:38:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-13 14:38:45 +0200
commit4d70c9b3e5e480d6dfa1c94506270f1f78e8ef32 (patch)
tree35e71c16c55fd3a18a9e5f47d0b027866f825e35 /tools/syslogd.c
parentbecc47cef625bfabf53589bb98ca10c352a4c824 (diff)
downloadrsyslog-4d70c9b3e5e480d6dfa1c94506270f1f78e8ef32.tar.gz
rsyslog-4d70c9b3e5e480d6dfa1c94506270f1f78e8ef32.tar.xz
rsyslog-4d70c9b3e5e480d6dfa1c94506270f1f78e8ef32.zip
added some debug settings plus improved shutdown sequence
... non-working version!
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r--tools/syslogd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 58046558..36a46175 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -631,7 +631,7 @@ finalize_it:
* for the main queue.
*/
static rsRetVal
-msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch)
+msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch, int *pbShutdownImmediate)
{
int i;
msg_t *pMsg;
@@ -639,7 +639,7 @@ msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch)
assert(pBatch != NULL);
- for(i = 0 ; i < pBatch->nElem ; i++) {
+ for(i = 0 ; i < pBatch->nElem && !*pbShutdownImmediate ; i++) {
pMsg = (msg_t*) pBatch->pElem[i].pUsrp;
DBGPRINTF("msgConsumer processes msg %d/%d\n", i, pBatch->nElem);
if((pMsg->msgFlags & NEEDS_PARSING) != 0) {