summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-12-19 11:20:59 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-12-19 11:20:59 +0100
commit6bcc1e371b8c27b227a7c87f475063f7fddfd44f (patch)
tree0941df531236de6a65b5ddaf02a07020fdc11a97 /action.c
parentbe2383f2b80d4fb83abd2765e6467e8d7614ab49 (diff)
parent5fe837bf7dbdcc245ee233feb1fbcc6d052a4898 (diff)
downloadrsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.tar.gz
rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.tar.xz
rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.zip
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts: ChangeLog action.c
Diffstat (limited to 'action.c')
-rw-r--r--action.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/action.c b/action.c
index 84b97e5c..ca054d84 100644
--- a/action.c
+++ b/action.c
@@ -660,7 +660,7 @@ static rsRetVal actionTryResume(action_t *pThis, int *pbShutdownImmediate)
* here. -- rgerhards, 2009-03-18
*/
datetime.GetTime(&ttNow); /* cache "now" */
- if(ttNow > pThis->ttResumeRtry) {
+ if(ttNow >= pThis->ttResumeRtry) {
actionSetState(pThis, ACT_STATE_RTRY); /* back to retries */
}
}