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 /action.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 'action.c')
| -rw-r--r-- | action.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -961,6 +961,8 @@ actionProcessMessage(action_t *pThis, msg_t *pMsg, void *actParams, int *pbShutd ISOBJ_TYPE_assert(pMsg, msg); CHKiRet(actionPrepare(pThis, pbShutdownImmediate)); + if(pThis->pMod->mod.om.SetShutdownImmdtPtr != NULL) + pThis->pMod->mod.om.SetShutdownImmdtPtr(pThis->pModData, pbShutdownImmediate); if(pThis->eState == ACT_STATE_ITX) CHKiRet(actionCallDoAction(pThis, pMsg, actParams)); @@ -1272,8 +1274,11 @@ processBatchMain(action_t *pAction, batch_t *pBatch, int *pbShutdownImmediate) assert(pBatch != NULL); - pbShutdownImmdtSave = pBatch->pbShutdownImmediate; - pBatch->pbShutdownImmediate = pbShutdownImmediate; + if(pbShutdownImmediate != NULL) { + pbShutdownImmdtSave = pBatch->pbShutdownImmediate; + pBatch->pbShutdownImmediate = pbShutdownImmediate; +dbgprintf("DDDD: processBatchMain ShutdownImmediate is %p, was %p\n", pBatch->pbShutdownImmediate, pbShutdownImmdtSave); + } CHKiRet(prepareBatch(pAction, pBatch, &activeSave, &bMustRestoreActivePtr)); /* We now must guard the output module against execution by multiple threads. The @@ -1304,7 +1309,8 @@ processBatchMain(action_t *pAction, batch_t *pBatch, int *pbShutdownImmediate) } finalize_it: - pBatch->pbShutdownImmediate = pbShutdownImmdtSave; + if(pbShutdownImmediate != NULL) + pBatch->pbShutdownImmediate = pbShutdownImmdtSave; RETiRet; } #pragma GCC diagnostic warning "-Wempty-body" |