diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-13 10:45:00 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-13 10:45:00 +0200 |
commit | f6aaff61de103d5d3b73b3da97dd96fff1c9030d (patch) | |
tree | 47a7864577b9e58d3a7c53a978a21b67356b1bda | |
parent | d6a6666b66733e63255f806dd272a0b85e0f0c13 (diff) | |
parent | 8dd9959735014aab70a65a9e8832cd1818ba210d (diff) | |
download | rsyslog-f6aaff61de103d5d3b73b3da97dd96fff1c9030d.tar.gz rsyslog-f6aaff61de103d5d3b73b3da97dd96fff1c9030d.tar.xz rsyslog-f6aaff61de103d5d3b73b3da97dd96fff1c9030d.zip |
Merge branch 'v4-stable' into v5-stable
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | action.c | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -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) @@ -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; } |