summaryrefslogtreecommitdiffstats
path: root/action.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-16 16:58:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-16 16:58:15 +0200
commitc5178a4d21cf8ca3362b8a8394d0e762801550a4 (patch)
tree0916303e0cd18e00397a6eb28a64b32aa5908c4d /action.h
parent65cdfc1777e1c189f28dfe11fa1ab0d08930b458 (diff)
parent11a526bcee95dab6a5bf2cc25a07dc6d65eaa177 (diff)
downloadrsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.tar.gz
rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.tar.bz2
rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.zip
Merge branch 'master' into beta
3.17.x is the new beta Conflicts: ChangeLog configure.ac
Diffstat (limited to 'action.h')
-rw-r--r--action.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/action.h b/action.h
index 1fa05c15..99108aab 100644
--- a/action.h
+++ b/action.h
@@ -39,8 +39,10 @@ extern int glbliActionResumeRetryCount;
/* the following struct defines the action object data structure
*/
struct action_s {
- time_t f_time; /* time this was last written */
+ time_t f_time; /* used for "message repeated n times" - be careful, old, old code */
+ time_t tLastExec; /* time this action was last executed */
int bExecWhenPrevSusp;/* execute only when previous action is suspended? */
+ int iSecsExecOnceInterval; /* if non-zero, minimum seconds to wait until action is executed again */
short bEnabled; /* is the related action enabled (1) or disabled (0)? */
short bSuspended; /* is the related action temporarily suspended? */
time_t ttResumeRtry; /* when is it time to retry the resume? */