diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 12:03:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 12:03:32 +0200 |
| commit | 25bc87872aabe03b35ca81f6be069b686e6a8435 (patch) | |
| tree | 8d5f2f98e191857e8e04cd816ee96de6a38e8629 /action.c | |
| parent | 1a9ac0ced72dd163228438af4f31f233fab20529 (diff) | |
| parent | 2082d963975a88c8e4dee3a43b98d939f9a2323f (diff) | |
| download | rsyslog-25bc87872aabe03b35ca81f6be069b686e6a8435.tar.gz rsyslog-25bc87872aabe03b35ca81f6be069b686e6a8435.tar.xz rsyslog-25bc87872aabe03b35ca81f6be069b686e6a8435.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
action.c
configure.ac
doc/manual.html
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -514,6 +514,10 @@ actionWriteToAction(action_t *pAction) pMsgSave = NULL; /* indicate message poiner not saved */ time(&now); /* we need this for several use cases, but obtain it once for performance reasons */ + if(pAction->tLastExec > now) { + /* if we are traveling back in time, reset tLastExec */ + pAction->tLastExec = (time_t) 0; + } /* first, we check if the action should actually be called. The action-specific * $ActionExecOnlyEveryNthTime permits us to execute an action only every Nth @@ -522,7 +526,6 @@ actionWriteToAction(action_t *pAction) * as the action was properly "passed to execution" from the upper layer's point * of view. -- rgerhards, 2008-08-07. */ -dbgprintf("NTH: conf: %d, actual %d\n", pAction->iExecEveryNthOccur, pAction->iNbrNoExec); if(pAction->iExecEveryNthOccur > 1) { /* we need to care about multiple occurences */ if( pAction->iExecEveryNthOccurTO > 0 |