diff options
author | Tomas Heinrich <theinric@redhat.com> | 2011-12-01 11:25:47 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-01 11:25:47 +0100 |
commit | 9859818eccb27a330537258d9149c7c5f32292f6 (patch) | |
tree | ba364db42f76819dc07cba92142a7f0e5fd6fd72 | |
parent | ffa6e3b9419e8794d6bba8a0ce5ade65cdcc9ccb (diff) | |
download | rsyslog-v3-stable.tar.gz rsyslog-v3-stable.tar.bz2 rsyslog-v3-stable.zip |
bugfix: action resume interval incorrectly handled, thus took longer to resumev3-stable
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | action.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -1,6 +1,8 @@ --------------------------------------------------------------------------- Version 3.22.4 [v3-stable] (rgerhards), 2010-??-?? -- bugfix: cosmetic proper constant used instead of number in open call +- bugfix: action resume interval incorrectly handled, thus took longer to + resume +- bugfix: cosmetic: proper constant used instead of number in open call - bugfix: timestamp was incorrectly calculated for timezones with minute offset closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271 @@ -355,7 +355,7 @@ static rsRetVal actionTryResume(action_t *pThis) ttNow = getActNow(pThis); /* cache "now" */ /* first check if it is time for a re-try */ - if(ttNow > pThis->ttResumeRtry) { + if(ttNow >= pThis->ttResumeRtry) { iRet = pThis->pMod->tryResume(pThis->pModData); if(iRet == RS_RET_SUSPENDED) { /* set new tryResume time */ |