summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rwxr-xr-xplugins/imjournal/imjournal.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 206468bb..b29af6a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ Version 7.5.1 [devel] 2013-06-??
bits being used for Diffie-Hellman key generation
* new parameter "compression.prioritystring" to control encryption
parameters used by GnuTLS
+- imjournal: imported patches from 7.4.1
- added experimental TCP stream compression (imptcp only, currently)
- added BSD-specific syslog facilities
* "console"
@@ -23,7 +24,7 @@ Version 7.5.0 [devel] 2013-06-11
connections
Thanks to Axel Rau for the patch.
---------------------------------------------------------------------------
-Version 7.4.1 [v7.4-stable] 2013-06-??
+Version 7.4.1 [v7.4-stable] 2013-06-17
- imjournal: add ratelimiting capability
The original imjournal code did not support ratelimiting at all. We
now have our own ratelimiter. This can mitigate against journal
diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
index f9c7eeec..36c7e046 100755
--- a/plugins/imjournal/imjournal.c
+++ b/plugins/imjournal/imjournal.c
@@ -604,11 +604,11 @@ ENDwillRun
/* close journal */
BEGINafterRun
CODESTARTafterRun
- ratelimitDestruct(ratelimiter);
if (cs.stateFile) { /* can't persist without a state file */
persistJournalState();
}
sd_journal_close(j);
+ ratelimitDestruct(ratelimiter);
ENDafterRun