summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-13 10:45:00 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-13 10:45:00 +0200
commitf6aaff61de103d5d3b73b3da97dd96fff1c9030d (patch)
tree47a7864577b9e58d3a7c53a978a21b67356b1bda
parentd6a6666b66733e63255f806dd272a0b85e0f0c13 (diff)
parent8dd9959735014aab70a65a9e8832cd1818ba210d (diff)
downloadrsyslog-f6aaff61de103d5d3b73b3da97dd96fff1c9030d.tar.gz
rsyslog-f6aaff61de103d5d3b73b3da97dd96fff1c9030d.tar.xz
rsyslog-f6aaff61de103d5d3b73b3da97dd96fff1c9030d.zip
Merge branch 'v4-stable' into v5-stable
-rw-r--r--ChangeLog2
-rw-r--r--action.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a0878d75..c3e9f555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -834,6 +834,8 @@ increase.
output module interface
---------------------------------------------------------------------------
Version 4.8.1 [v4-beta], 2011-09-??
+- bugfix: $ActionExecOnlyOnce interval did not work properly
+ Thanks to Tomas Heinrich for the patch
- bugfix: potential abort if ultra-large file io buffers are used and
dynafile cache exhausts address space (primarily a problem on 32 bit
platforms)
diff --git a/action.c b/action.c
index 951b4724..4fb1d0b3 100644
--- a/action.c
+++ b/action.c
@@ -1363,7 +1363,6 @@ actionWriteToAction(action_t *pAction)
DBGPRINTF("action not yet ready again to be executed, onceInterval %d, tCurr %d, tNext %d\n",
(int) pAction->iSecsExecOnceInterval, (int) getActNow(pAction),
(int) (pAction->iSecsExecOnceInterval + pAction->tLastExec));
- pAction->tLastExec = getActNow(pAction); /* re-init time flags */
FINALIZE;
}