diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 16:30:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 16:30:13 +0200 |
| commit | 945bc9bd0d9de984ab11b9faf609b809a1f3cb90 (patch) | |
| tree | f3464946b2eef29b2f8a4e54c32f7bf063a2c27f /action.c | |
| parent | f057fb2db388cc16475f9c5a7de64aeb1f3bdb43 (diff) | |
| parent | eccfbf71f9dbc235309c2ad40035d41620f5e5df (diff) | |
| download | rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.gz rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.xz rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.zip | |
Merge branch 'v5-beta' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |