diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-12 13:34:01 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-12 13:34:01 +0100 |
| commit | 58870fc483c441fba4a87b8411642ea5bc8a7e74 (patch) | |
| tree | 10726bfa4634429d24f0d3f41a2e5441b8a13ffb /action.c | |
| parent | 671470f1a1880865bc1175414b0e5000713556d1 (diff) | |
| parent | d7277484811249b7acacb45a223928980e1a36b4 (diff) | |
| download | rsyslog-58870fc483c441fba4a87b8411642ea5bc8a7e74.tar.gz rsyslog-58870fc483c441fba4a87b8411642ea5bc8a7e74.tar.xz rsyslog-58870fc483c441fba4a87b8411642ea5bc8a7e74.zip | |
Merge branch 'beta'
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -575,8 +575,19 @@ static rsRetVal actionPrepare(action_t *pThis) * action state accordingly */ if(pThis->eState == ACT_STATE_RDY) { - CHKiRet(pThis->pMod->mod.om.beginTransaction(pThis->pModData)); - actionSetState(pThis, ACT_STATE_ITX); + iRet = pThis->pMod->mod.om.beginTransaction(pThis->pModData); + switch(iRet) { + case RS_RET_OK: + actionSetState(pThis, ACT_STATE_ITX); + break; + case RS_RET_SUSPENDED: + actionRetry(pThis); + break; + case RS_RET_DISABLE_ACTION: + actionDisable(pThis); + break; + default:FINALIZE; + } } finalize_it: @@ -773,7 +784,6 @@ finishBatch(action_t *pThis, batch_t *pBatch) CHKiRet(actionPrepare(pThis)); if(pThis->eState == ACT_STATE_ITX) { iRet = pThis->pMod->mod.om.endTransaction(pThis->pModData); -dbgprintf("XXX: finishBatch, result of endTranscation %d\n", iRet); switch(iRet) { case RS_RET_OK: actionCommitted(pThis); |