diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-26 15:55:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-26 15:55:51 +0200 |
| commit | ed7f89a49c6f820bc65f87514eb0effafcdeaacc (patch) | |
| tree | 86ae5d3cddc18a0efa4330da85fafe8af331a29d /action.h | |
| parent | 59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0 (diff) | |
| parent | 149bab9cd1eb77c0708369d0a56903db90ab9d5f (diff) | |
| download | rsyslog-ed7f89a49c6f820bc65f87514eb0effafcdeaacc.tar.gz rsyslog-ed7f89a49c6f820bc65f87514eb0effafcdeaacc.tar.xz rsyslog-ed7f89a49c6f820bc65f87514eb0effafcdeaacc.zip | |
Merge branch 'v5-stable'
Diffstat (limited to 'action.h')
| -rw-r--r-- | action.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -56,8 +56,9 @@ struct action_s { sbool bWriteAllMarkMsgs;/* should all mark msgs be written (not matter how recent the action was executed)? */ int iSecsExecOnceInterval; /* if non-zero, minimum seconds to wait until action is executed again */ action_state_t eState; /* current state of action */ - int bHadAutoCommit; /* did an auto-commit happen during doAction()? */ + bool bHadAutoCommit; /* did an auto-commit happen during doAction()? */ time_t ttResumeRtry; /* when is it time to retry the resume? */ + int iResumeOKinRow; /* number of times in a row that resume said OK with an immediate failure following */ int iResumeInterval;/* resume interval for this action */ int iResumeRetryCount;/* how often shall we retry a suspended action? (-1 --> eternal) */ int iNbrResRtry; /* number of retries since last suspend */ |