diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:21:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:21:46 +0100 |
| commit | 0fd8143d8719d08d9feb0a304bb352dd7c4bbab6 (patch) | |
| tree | b344fb400aabea95b2352ba13f51ae438a08d51a /action.c | |
| parent | 22bf4fc83274df41f9d490f522718f248e35c1f5 (diff) | |
| parent | 0a5b731f2f18168795bcdefd9b6fa562dce6a0d5 (diff) | |
| download | rsyslog-0fd8143d8719d08d9feb0a304bb352dd7c4bbab6.tar.gz rsyslog-0fd8143d8719d08d9feb0a304bb352dd7c4bbab6.tar.xz rsyslog-0fd8143d8719d08d9feb0a304bb352dd7c4bbab6.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -710,7 +710,7 @@ actionWriteToAction(action_t *pAction) * a purely logical point of view. However, if safes us to check the system time in * (those common) cases where ExecOnceInterval is not used. -- rgerhards, 2008-09-16 */ - if(pAction->f_time != 0 && pAction->iSecsExecOnceInterval > 0 && + if(pAction->iSecsExecOnceInterval > 0 && pAction->iSecsExecOnceInterval + pAction->tLastExec > getActNow(pAction)) { /* in this case we need to discard the message - its not yet time to exec the action */ DBGPRINTF("action not yet ready again to be executed, onceInterval %d, tCurr %d, tNext %d\n", @@ -721,6 +721,7 @@ actionWriteToAction(action_t *pAction) } /* we use reception time, not dequeue time - this is considered more appropriate and also faster ;) -- rgerhards, 2008-09-17 */ + pAction->tLastExec = getActNow(pAction); /* re-init time flags */ pAction->f_time = pAction->f_pMsg->ttGenTime; /* When we reach this point, we have a valid, non-disabled action. |