diff options
author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:46:33 +0200 |
---|---|---|
committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:46:33 +0200 |
commit | e14d353e69a75290c3e4004df79f42a22bfe4cab (patch) | |
tree | 7d74717632ca25ea585aa30df87d43c1e2f4af3d /action.c | |
parent | 179a27d80d6c13625d5f9cee9b15acbd5fb33651 (diff) | |
parent | c1108d7af1ca04b2c485bd87a8cbbf044ffde6fb (diff) | |
download | rsyslog-e14d353e69a75290c3e4004df79f42a22bfe4cab.tar.gz rsyslog-e14d353e69a75290c3e4004df79f42a22bfe4cab.tar.xz rsyslog-e14d353e69a75290c3e4004df79f42a22bfe4cab.zip |
Merge branch 'beta'
Conflicts:
runtime/queue.c
Diffstat (limited to 'action.c')
-rw-r--r-- | action.c | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -1032,13 +1032,17 @@ tryDoAction(action_t *pAction, batch_t *pBatch, int *pnElem) /* mark messages as committed */ while(iCommittedUpTo <= i) { pBatch->pElem[iCommittedUpTo].bPrevWasSuspended = 0; /* we had success! */ - pBatch->pElem[iCommittedUpTo++].state = BATCH_STATE_COMM; + batchSetElemState(pBatch, iCommittedUpTo, BATCH_STATE_COMM); + ++iCommittedUpTo; + //pBatch->pElem[iCommittedUpTo++].state = BATCH_STATE_COMM; } } else if(localRet == RS_RET_PREVIOUS_COMMITTED) { /* mark messages as committed */ while(iCommittedUpTo < i) { pBatch->pElem[iCommittedUpTo].bPrevWasSuspended = 0; /* we had success! */ - pBatch->pElem[iCommittedUpTo++].state = BATCH_STATE_COMM; + batchSetElemState(pBatch, iCommittedUpTo, BATCH_STATE_COMM); + ++iCommittedUpTo; + //pBatch->pElem[iCommittedUpTo++].state = BATCH_STATE_COMM; } pBatch->pElem[i].state = BATCH_STATE_SUB; } else if(localRet == RS_RET_DEFER_COMMIT) { @@ -1063,6 +1067,15 @@ finalize_it: RETiRet; } +/* debug aid */ +static void displayBatchState(batch_t *pBatch) +{ + int i; + for(i = 0 ; i < pBatch->nElem ; ++i) { + dbgprintf("XXXXX: displayBatchState2 %p[%d]: %d\n", pBatch, i, pBatch->pElem[i].state); + } +} + /* submit a batch for actual action processing. * The first nElem elements are processed. This function calls itself |