summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-06-21 12:43:44 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-06-21 12:43:44 +0200
commitd6a3b08f56cc608bc832251cd49e86e71d9574dc (patch)
tree8a8ac11597e76ca1eccf591352006c12f61e128e
parentdc653ed74f2299b2023da9a30c2f5d03c23e71ab (diff)
downloadrsyslog-d6a3b08f56cc608bc832251cd49e86e71d9574dc.tar.gz
rsyslog-d6a3b08f56cc608bc832251cd49e86e71d9574dc.tar.xz
rsyslog-d6a3b08f56cc608bc832251cd49e86e71d9574dc.zip
fixed problem in action message induced failure handling
-rw-r--r--action.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/action.c b/action.c
index c5bb9088..20fc3cb6 100644
--- a/action.c
+++ b/action.c
@@ -910,7 +910,8 @@ dbgprintf("ZZZ1: tryDoAction, nElem %d, iDoneUpto %d\n", *pnElem, pBatch->iDoneU
} else if(localRet == RS_RET_DISCARDMSG) {
pBatch->pElem[i].state = BATCH_STATE_DISC;
} else {
- dbgprintf("tryDoAction: unexpected error code %d, finalizing\n", localRet);
+ dbgprintf("tryDoAction: unexpected error code %d[nElem %d, Commited UpTo %d], finalizing\n",
+ localRet, *pnElem, iCommittedUpTo);
iRet = localRet;
FINALIZE;
}
@@ -921,7 +922,6 @@ dbgprintf("ZZZ1: tryDoAction, nElem %d, iDoneUpto %d\n", *pnElem, pBatch->iDoneU
finalize_it:
if(pBatch->iDoneUpTo != iCommittedUpTo) {
- *pnElem += iCommittedUpTo - pBatch->iDoneUpTo;
pBatch->iDoneUpTo = iCommittedUpTo;
}
RETiRet;