summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-03-05 15:39:33 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-03-05 15:39:33 +0000
commit056c60ec3d3a7b809791ee75e20f97e6ffc9a524 (patch)
treee4b98c55e6cf9a5d8bb8e6e46045157b3adc6951
parent6be70e1b6102f0212b9187b0e3faa61d9af329ff (diff)
downloadrsyslog-056c60ec3d3a7b809791ee75e20f97e6ffc9a524.tar.gz
rsyslog-056c60ec3d3a7b809791ee75e20f97e6ffc9a524.tar.xz
rsyslog-056c60ec3d3a7b809791ee75e20f97e6ffc9a524.zip
bugfix: actions were not correctly retried; caused message loss
-rw-r--r--ChangeLog1
-rw-r--r--action.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 39f6195e..8a19edd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 3.12.1 (rgerhards), 2008-03-??
+- bugfix: actions were not correctly retried; caused message loss
- improved debugging support; debug runtime options can now be set via
an environment variable
- added library plugins, which can be automatically loaded
diff --git a/action.c b/action.c
index e8409bfa..5095993a 100644
--- a/action.c
+++ b/action.c
@@ -405,7 +405,10 @@ actionCallDoAction(action_t *pAction, msg_t *pMsg)
/* first check if we are suspended and, if so, retry */
if(actionIsSuspended(pAction)) {
iRet = actionTryResume(pAction);
- bCallAction = 0;
+ if(iRet == RS_RET_OK)
+ bCallAction = 1;
+ else
+ bCallAction = 0;
} else {
bCallAction = 1;
}