diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:36:29 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:36:29 +0100 |
| commit | adab485b93a6bc87a90337f9f46dac1a9dfd62b1 (patch) | |
| tree | 7ff7c12a27f26a6d1e89330c2d31c783a5f8b6fc /action.c | |
| parent | 2dafb35077f013a22f0ce9d59306d8f59d709a51 (diff) | |
| parent | 329b20451f0ed767dbf08903cab9a380ff1f4302 (diff) | |
| download | rsyslog-adab485b93a6bc87a90337f9f46dac1a9dfd62b1.tar.gz rsyslog-adab485b93a6bc87a90337f9f46dac1a9dfd62b1.tar.xz rsyslog-adab485b93a6bc87a90337f9f46dac1a9dfd62b1.zip | |
Merge branch 'v4-devel'
Conflicts:
tests/Makefile.am
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1132,7 +1132,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", @@ -1143,6 +1143,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. |