diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-24 16:25:54 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-24 16:25:54 +0100 |
commit | 7269efe60a2071e17f68f96b6416acaefeb7068d (patch) | |
tree | 6c9b53b253a19b785afa8f780650066aa9a5bbe4 /action.c | |
parent | de3341a64131092fabb3a1c60adb77e70bdb7fb6 (diff) | |
parent | 508a9e0cef064b082cd9e13aecd9d6c0f1f51977 (diff) | |
download | rsyslog-7269efe60a2071e17f68f96b6416acaefeb7068d.tar.gz rsyslog-7269efe60a2071e17f68f96b6416acaefeb7068d.tar.xz rsyslog-7269efe60a2071e17f68f96b6416acaefeb7068d.zip |
Merge branch 'omfile-errHandler'
Conflicts:
ChangeLog
Diffstat (limited to 'action.c')
-rw-r--r-- | action.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -353,7 +353,13 @@ static rsRetVal actionTryResume(action_t *pThis) ASSERT(pThis != NULL); - ttNow = getActNow(pThis); /* cache "now" */ + /* for resume handling, we must always obtain a fresh timestamp. We used + * to use the action timestamp, but in this case we will never reach a + * point where a resumption is actually tried, because the action timestamp + * is always in the past. So we can not avoid doing a fresh time() call + * here. -- rgerhards, 2009-03-18 + */ + time(&ttNow); /* cache "now" */ /* first check if it is time for a re-try */ if(ttNow > pThis->ttResumeRtry) { |