summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-01-14 13:00:58 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-01-14 13:00:58 +0000
commit9591ecf7947ccb0a59419cce6f6aeaa1f5ae64d6 (patch)
tree45a01844411ce430ce79d761fdb4b834e0497e54
parentb49bf8c9227cd0744e9cf51e79e2a921c09a2483 (diff)
downloadrsyslog-9591ecf7947ccb0a59419cce6f6aeaa1f5ae64d6.tar.gz
rsyslog-9591ecf7947ccb0a59419cce6f6aeaa1f5ae64d6.tar.xz
rsyslog-9591ecf7947ccb0a59419cce6f6aeaa1f5ae64d6.zip
preparing for 3.10.2
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac2
-rw-r--r--doc/status.html8
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 5225c6da..ce3b0da8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,17 @@
---------------------------------------------------------------------------
-Version 3.10.2 (rgerhards), 2008-01-1?
+Version 3.10.2 (rgerhards), 2008-01-14
- added the ability to keep stop rsyslogd without the need to drain
the main message queue. In disk queue mode, rsyslog continues to
run from the point where it stopped. In case of a system failure, it
continues to process messages from the last checkpoint.
- fixed a bug that caused a segfault on startup when no $WorkDir directive
was specified in rsyslog.conf
-- added $MainMsgQueueImmediateShutdown config directive
-- added $MainMsgQueueCheckpointInterval config file directive
+- provided more fine-grain control over shutdown timeouts and added a
+ way to specify the enqueue timeout when the main message queue is full
+- implemetned $MainMsgQueueCheckpointInterval config directive
+- implemented $MainMsgQueueTimeoutActionCompletion config directive
+- implemented $MainMsgQueueTimeoutEnqueue config directive
+- implemented $MainMsgQueueTimeoutShutdown config directive
---------------------------------------------------------------------------
Version 3.10.1 (rgerhards), 2008-01-10
- implemented the "disk" queue mode. However, it currently is of very
diff --git a/configure.ac b/configure.ac
index 2da0e5b9..467f62ee 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],[3.10.1],[rsyslog@lists.adiscon.com.])
+AC_INIT([rsyslog],[3.10.2],[rsyslog@lists.adiscon.com.])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([syslogd.c])
AC_CONFIG_HEADERS([config.h])
diff --git a/doc/status.html b/doc/status.html
index 6f44739a..7950cfdb 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -4,11 +4,11 @@
</head>
<body>
<h2>rsyslog status page</h2>
-<p>This page reflects the status as of 2008-01-10.</p>
+<p>This page reflects the status as of 2008-01-14.</p>
<h2>Current Releases</h2>
-<p><b>development:</b> 3.10.1 -
-<a href="http://www.rsyslog.com/Article159.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-72.phtml">download</a></p>
+<p><b>development:</b> 3.10.2 -
+<a href="http://www.rsyslog.com/Article161.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-73.phtml">download</a></p>
<p><b><font color="#FF0000"><a href="v3compatibility.html">Be sure to read the
rsyslog v3 compatibility document!</a></font></b><br>
Documentation for 3.x is currently sparse. If you need assistance, please