diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-17 14:18:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-17 14:18:23 +0200 |
| commit | 1f6d402d50501bc612eb5041ed0674eb23432166 (patch) | |
| tree | 1ed01b0e78c45a3daf9c63b91f5f325a9d6af152 | |
| parent | 4357348b96e801bad73e83bc7891cd4d08b18b24 (diff) | |
| download | rsyslog-1f6d402d50501bc612eb5041ed0674eb23432166.tar.gz rsyslog-1f6d402d50501bc612eb5041ed0674eb23432166.tar.bz2 rsyslog-1f6d402d50501bc612eb5041ed0674eb23432166.zip | |
imjournal fix: put ratelimiter destruction in wrong entry point
No regression, this was in recently written, never-released code.
| -rwxr-xr-x | plugins/imjournal/imjournal.c | 2 | ||||
| -rw-r--r-- | runtime/ratelimit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c index dcae5354..f9c7eeec 100755 --- a/plugins/imjournal/imjournal.c +++ b/plugins/imjournal/imjournal.c @@ -604,6 +604,7 @@ ENDwillRun /* close journal */ BEGINafterRun CODESTARTafterRun + ratelimitDestruct(ratelimiter); if (cs.stateFile) { /* can't persist without a state file */ persistJournalState(); } @@ -613,7 +614,6 @@ ENDafterRun BEGINmodExit CODESTARTmodExit - ratelimitDestruct(ratelimiter); if(pInputName != NULL) prop.Destruct(&pInputName); if(pLocalHostIP != NULL) diff --git a/runtime/ratelimit.c b/runtime/ratelimit.c index f5c75c53..a808e04a 100644 --- a/runtime/ratelimit.c +++ b/runtime/ratelimit.c @@ -164,7 +164,7 @@ withinRatelimit(ratelimit_t *ratelimit, time_t tt) if(ratelimit->begin == 0) ratelimit->begin = tt; - /* resume if we go out of out time window */ + /* resume if we go out of time window */ if(tt > ratelimit->begin + ratelimit->interval) { ratelimit->begin = 0; ratelimit->done = 0; |