diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 16:04:27 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 16:04:27 +0100 |
| commit | 268bd872ed3e8b4cfb8da5338b68ce1ccbab7e7a (patch) | |
| tree | 3613420a15d8cc3cb0bda78b0a67b7a6a48e67bf /runtime/ruleset.c | |
| parent | 98900cfd0f414012ed937af047c07415d3d3972c (diff) | |
| download | rsyslog-268bd872ed3e8b4cfb8da5338b68ce1ccbab7e7a.tar.gz rsyslog-268bd872ed3e8b4cfb8da5338b68ce1ccbab7e7a.tar.bz2 rsyslog-268bd872ed3e8b4cfb8da5338b68ce1ccbab7e7a.zip | |
simplify submitToActionQ...() code path
Diffstat (limited to 'runtime/ruleset.c')
| -rw-r--r-- | runtime/ruleset.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c index 4ac0039a..6013baf7 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -169,8 +169,14 @@ execAct(struct cnfstmt *stmt, msg_t *pMsg, wti_t *pWti) // if we actually are permitted to execute this action. // NOTE: this will primarily be handled by end-of-batch processing + if(getActionState(pWti, stmt->d.act) == ACT_STATE_DIED) { + DBGPRINTF("action %d died, do NOT execute\n", stmt->d.act->iActionNbr); + goto done; + } + DBGPRINTF("executing action %d\n", stmt->d.act->iActionNbr); stmt->d.act->submitToActQ(stmt->d.act, pWti, pMsg); +done: return; } static void |