summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-02 11:56:34 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-02 11:56:34 +0200
commit2082d963975a88c8e4dee3a43b98d939f9a2323f (patch)
tree340aa3b7084ed619e994b8bed6edbe77e66c45b2 /action.c
parent9b46c03ce20c2d074bafdd68840461ed89b35ef4 (diff)
parentfcc4d77dd371744530e46a29b7534e89cf8251c4 (diff)
downloadrsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.gz
rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.xz
rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'action.c')
-rw-r--r--action.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/action.c b/action.c
index f7219405..61ff589a 100644
--- a/action.c
+++ b/action.c
@@ -546,6 +546,10 @@ actionWriteToAction(action_t *pAction)
dbgprintf("Called action, logging to %s\n", module.GetStateName(pAction->pMod));
time(&now); /* we need this for message repeation processing AND $ActionExecOnlyOnceEveryInterval */
+ if(pAction->tLastExec > now) {
+ /* if we are traveling back in time, reset tLastExec */
+ pAction->tLastExec = (time_t) 0;
+ }
/* now check if we need to drop the message because otherwise the action would be too
* frequently called. -- rgerhards, 2008-04-08
*/