From 4357348b96e801bad73e83bc7891cd4d08b18b24 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 17 Jun 2013 13:34:17 +0200 Subject: implement new ratelimiting mode for imjournal and make imjournal use it. The new mode is needed, as imjournal uses journal's timestamp as message generation time (which otherwise is when the message entered the system, and the ratelimiter uses this as current timestamp in order to save performance). It is debatable if imjournal is doing the right thing here. But it doesn't feel totally wrong. So let's safe that debate for later ;) --- plugins/imjournal/imjournal.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'plugins/imjournal/imjournal.c') diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c index 7f6c31d6..dcae5354 100755 --- a/plugins/imjournal/imjournal.c +++ b/plugins/imjournal/imjournal.c @@ -515,7 +515,10 @@ finalize_it: BEGINrunInput CODESTARTrunInput CHKiRet(ratelimitNew(&ratelimiter, "imjournal", NULL)); + dbgprintf("imjournal: ratelimiting burst %d, interval %d\n", cs.ratelimitBurst, + cs.ratelimitInterval); ratelimitSetLinuxLike(ratelimiter, cs.ratelimitInterval, cs.ratelimitBurst); + ratelimitSetNoTimeCache(ratelimiter); if (cs.stateFile) { CHKiRet(loadJournalState()); -- cgit v1.2.3 From 1f6d402d50501bc612eb5041ed0674eb23432166 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 17 Jun 2013 14:18:23 +0200 Subject: imjournal fix: put ratelimiter destruction in wrong entry point No regression, this was in recently written, never-released code. --- plugins/imjournal/imjournal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/imjournal/imjournal.c') 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) -- cgit v1.2.3