From 3911b41420ca6bb38d99328b70ff09725094b762 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Mon, 17 Jun 2013 14:33:14 +0200
Subject: imjournal: rate limiter was destructed too early
Too quick hacking, obviously, one too late, one too early, now
it should fit ;) Thanks to Tomas Heinrich for pointing this out.
---
plugins/imjournal/imjournal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
cgit v1.2.3
From 2704b0ca2292929e66c951d94bc18a316ee77541 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Mon, 17 Jun 2013 14:55:54 +0200
Subject: prepare for 7.4.1 release
---
ChangeLog | 2 +-
configure.ac | 2 +-
doc/manual.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d730b087..8250a925 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-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/configure.ac b/configure.ac
index ce24f53e..bb0de0c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[7.4.0],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.4.1],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index dea0b82d..bc57c136 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ professional services available directly from the source!
Please visit the rsyslog sponsor's page
to honor the project sponsors or become one yourself! We are very grateful for any help towards the
project goals.
-This documentation is for version 7.4.0 (v7.4-stable branch) of rsyslog.
+
This documentation is for version 7.4.1 (v7.4-stable branch) of rsyslog.
Visit the rsyslog status page
to obtain current version information and project status.
If you like rsyslog, you might
--
cgit v1.2.3