diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-06 12:24:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-06 12:24:49 +0100 |
| commit | 2a94703425c6fb29b7e9d0a00090c83731dead61 (patch) | |
| tree | ae4541c7cbe51c1f69daf6aa973d423a1f5a72e6 /runtime/ruleset.c | |
| parent | 1e20ff6b71aa19ca45ae7e68421370c830141af2 (diff) | |
| download | rsyslog-2a94703425c6fb29b7e9d0a00090c83731dead61.tar.gz rsyslog-2a94703425c6fb29b7e9d0a00090c83731dead61.tar.bz2 rsyslog-2a94703425c6fb29b7e9d0a00090c83731dead61.zip | |
refactor action disabling
Diffstat (limited to 'runtime/ruleset.c')
| -rw-r--r-- | runtime/ruleset.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c index 822150d9..2e8d1f0f 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -165,11 +165,7 @@ finalize_it: static void execAct(struct cnfstmt *stmt, msg_t *pMsg, wti_t *pWti) { -// TODO: check here if bPrevWasSuspsended was required and, if so -// 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) { + if(stmt->d.act->bDisabled) { DBGPRINTF("action %d died, do NOT execute\n", stmt->d.act->iActionNbr); goto done; } |