diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-01 11:30:10 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-01 11:30:10 +0100 |
| commit | d2da5f39d0ca3881aface8e0a105efa130353a58 (patch) | |
| tree | c44bfd4ccf17b347e4623c32f9db2d2b734bc39a /action.c | |
| parent | d34a25b78cb6524096a722bfff393b4797b4d478 (diff) | |
| parent | cb0087ec4736089d73d0368e683b652013483a52 (diff) | |
| download | rsyslog-d2da5f39d0ca3881aface8e0a105efa130353a58.tar.gz rsyslog-d2da5f39d0ca3881aface8e0a105efa130353a58.tar.xz rsyslog-d2da5f39d0ca3881aface8e0a105efa130353a58.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
action.c
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -627,7 +627,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 */ } } |