diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-09 11:29:39 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-09 11:29:39 +0200 |
commit | acd140f653b694b36c4532548cfd69772b8931b4 (patch) | |
tree | d184aff83e2547c91d9b9f757d9ff2008c3d42ab /tools/syslogd.c | |
parent | 5acc47276816962b4d4ec58fdbbef1def08d7a3f (diff) | |
parent | 86e34c6985da29c62f13ab83e44548f1fd21849d (diff) | |
download | rsyslog-acd140f653b694b36c4532548cfd69772b8931b4.tar.gz rsyslog-acd140f653b694b36c4532548cfd69772b8931b4.tar.bz2 rsyslog-acd140f653b694b36c4532548cfd69772b8931b4.zip |
Merge branch 'c7' into tmp
Conflicts:
ChangeLog
configure.ac
runtime/queue.c
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r-- | tools/syslogd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index e291ba47..03fb2bd9 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -567,6 +567,7 @@ msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch, int *pbShu assert(pBatch != NULL); pBatch->pbShutdownImmediate = pbShutdownImmediate; /* TODO: move this to batch creation! */ preprocessBatch(pBatch); +dbgprintf("DDDD: batches ShutdownImmediate is %p\n", pBatch->pbShutdownImmediate); ruleset.ProcessBatch(pBatch); //TODO: the BATCH_STATE_COMM must be set somewhere down the road, but we //do not have this yet and so we emulate -- 2010-06-10 |