summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-03-29 11:48:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-03-29 11:48:45 +0200
commitd2cce9852bdd9ba9f93ac94d6c8b0178d5b82bb0 (patch)
treeffbb3352a681da2026d606de98213ed3011b8ce5 /action.c
parent0fcbbfbe3b40e2739531cfa3a308c6fc8681ee7f (diff)
downloadrsyslog-d2cce9852bdd9ba9f93ac94d6c8b0178d5b82bb0.tar.gz
rsyslog-d2cce9852bdd9ba9f93ac94d6c8b0178d5b82bb0.tar.xz
rsyslog-d2cce9852bdd9ba9f93ac94d6c8b0178d5b82bb0.zip
bugfix: error return from strgen caused abort, now causes action to be ignored
...(just like a failed filter)
Diffstat (limited to 'action.c')
-rw-r--r--action.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/action.c b/action.c
index ea4358fb..c5bd03cb 100644
--- a/action.c
+++ b/action.c
@@ -1071,7 +1071,8 @@ prepareBatch(action_t *pAction, batch_t *pBatch)
pElem = &(pBatch->pElem[i]);
if(pElem->bFilterOK && pElem->state != BATCH_STATE_DISC) {
pElem->state = BATCH_STATE_RDY;
- prepareDoActionParams(pAction, pElem);
+ if(prepareDoActionParams(pAction, pElem) != RS_RET_OK)
+ pElem->bFilterOK = FALSE;
}
}
RETiRet;