diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-29 11:48:45 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-29 11:48:45 +0200 |
commit | d2cce9852bdd9ba9f93ac94d6c8b0178d5b82bb0 (patch) | |
tree | ffbb3352a681da2026d606de98213ed3011b8ce5 | |
parent | 0fcbbfbe3b40e2739531cfa3a308c6fc8681ee7f (diff) | |
download | rsyslog-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)
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | action.c | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,7 @@ --------------------------------------------------------------------------- Version 5.7.10 [V5-BETA] (rgerhards), 2011-03-?? +- bugfix: error return from strgen caused abort, now causes action to be + ignored (just like a failed filter) - new sample plugin for a strgen to generate sql statement consumable by a database plugin - bugfix: strgen could not be used together with database outputs @@ -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; |