diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 08:59:42 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 08:59:42 +0100 |
| commit | 11420835659758f9ff2f527b3083f5203584a526 (patch) | |
| tree | 57f433ae7a7616544a163b97688a0e08638c2461 /tools/syslogd.c | |
| parent | 774f7b7986c7eb84c1d3c7e75ee5f1b03a4f055b (diff) | |
| download | rsyslog-11420835659758f9ff2f527b3083f5203584a526.tar.gz rsyslog-11420835659758f9ff2f527b3083f5203584a526.tar.bz2 rsyslog-11420835659758f9ff2f527b3083f5203584a526.zip | |
refactor: move pbShutdownImmediate to wti_t
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 0fb9a9fe..c27d79b7 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -497,7 +497,7 @@ finalize_it: * rgerhards, 2010-06-09 */ static inline rsRetVal -preprocessBatch(batch_t *pBatch) { +preprocessBatch(batch_t *pBatch, int *pbShutdownImmediate) { prop_t *ip; prop_t *fqdn; prop_t *localName; @@ -509,7 +509,7 @@ preprocessBatch(batch_t *pBatch) { rsRetVal localRet; DEFiRet; - for(i = 0 ; i < pBatch->nElem && !*(pBatch->pbShutdownImmediate) ; i++) { + for(i = 0 ; i < pBatch->nElem && !*pbShutdownImmediate ; i++) { pMsg = pBatch->pElem[i].pMsg; if((pMsg->msgFlags & NEEDS_ACLCHK_U) != 0) { DBGPRINTF("msgConsumer: UDP ACL must be checked for message (hostname-based)\n"); @@ -555,8 +555,8 @@ msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch, wti_t *pWt { DEFiRet; assert(pBatch != NULL); - pBatch->pbShutdownImmediate = pbShutdownImmediate; /* TODO: move this to batch creation! */ - preprocessBatch(pBatch); + pWti->pbShutdownImmediate = pbShutdownImmediate; + preprocessBatch(pBatch, pWti->pbShutdownImmediate); ruleset.ProcessBatch(pBatch, pWti); //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 |