summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-22 16:30:52 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-22 16:30:52 +0200
commit4ee092935b56c24ceb53488be04175482638b686 (patch)
treeb9d82df6e8d9d2559ba9c2f3ea848cdb0a9d6ea9
parentf0732cb75b237f6a853dadb0c6cff5d6bef62952 (diff)
parent80fe59ba00d496cedff608e6e64e4d4968f297b6 (diff)
downloadrsyslog-4ee092935b56c24ceb53488be04175482638b686.tar.gz
rsyslog-4ee092935b56c24ceb53488be04175482638b686.tar.xz
rsyslog-4ee092935b56c24ceb53488be04175482638b686.zip
Merge branch 'beta'
-rw-r--r--ChangeLog3
-rw-r--r--doc/rsconf1_actionexeconlywhenpreviousissuspended.html8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 72ae5dfd..393fa4ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -259,6 +259,9 @@ Version 3.18.5 (rgerhards), 2008-10-??
- bugfix: imudp input module could cause segfault on HUP
It did not properly de-init a variable acting as a linked list head.
That resulted in trying to access freed memory blocks after the HUP.
+- doc bugfix: $ActionExecOnlyWhenPreviousIsSuspended was still misspelled
+ as $...OnlyIfPrev... in some parts of the documentation. Thanks to
+ Lorenzo M. Catucci for reporting this bug.
---------------------------------------------------------------------------
Version 3.18.4 (rgerhards), 2008-09-18
- bugfix: order-of magnitude issue with base-10 size definitions
diff --git a/doc/rsconf1_actionexeconlywhenpreviousissuspended.html b/doc/rsconf1_actionexeconlywhenpreviousissuspended.html
index 3f18e243..d5cf8b14 100644
--- a/doc/rsconf1_actionexeconlywhenpreviousissuspended.html
+++ b/doc/rsconf1_actionexeconlywhenpreviousissuspended.html
@@ -9,14 +9,14 @@
<p><b>Description:</b></p>
<p>This directive allows to specify if actions should always be executed ("off," the default) or only if the previous action is suspended ("on"). This directive works hand-in-hand with the multiple actions per selector feature. It can be used, for example, to create rules that automatically switch destination servers or databases to a (set of) backup(s), if the primary server fails. Note that this feature depends on proper implementation of the suspend feature in the output module. All built-in output modules properly support it (most importantly the database write and the syslog message forwarder).</p>
<p>This selector processes all messages it receives (*.*). It tries to forward every message to primary-syslog.example.com (via tcp). If it can not reach that server, it tries secondary-1-syslog.example.com, if that fails too, it tries secondary-2-syslog.example.com. If neither of these servers can be connected, the data is stored in /var/log/localbuffer. Please note that the secondaries and the local log buffer are only used if the one before them does not work. So ideally, /var/log/localbuffer will never receive a message. If one of the servers resumes operation, it automatically takes over processing again.</p>
-<p>We strongly advise not to use repeated line reduction together with ActionExecOnlyIfPreviousIsSuspended. It may lead to "interesting" and undesired results (but you can try it if you like).</p>
+<p>We strongly advise not to use repeated line reduction together with ActionExecOnlyWhenPreviousIsSuspended. It may lead to "interesting" and undesired results (but you can try it if you like).</p>
<p><b>Sample:</b></p>
<p><code><b>*.* @@primary-syslog.example.com
-<br>$ActionExecOnlyIfPreviousIsSuspended on
+<br>$ActionExecOnlyWhenPreviousIsSuspended on
<br>& @@secondary-1-syslog.example.com # & is used to have more than one action for
<br>& @@secondary-2-syslog.example.com # the same selector - the mult-action feature
<br>& /var/log/localbuffer
-<br>$ActionExecOnlyIfPreviousIsSuspended off # to re-set it for the next selector </b></code></p>
+<br>$ActionExecOnlyWhenPreviousIsSuspended off # to re-set it for the next selector </b></code></p>
<p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>] [<a href="manual.html">manual
index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>
@@ -26,4 +26,4 @@ Copyright &copy; 2007 by <a href="http://www.gerhards.net/rainer">Rainer Gerhard
<a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL
version 2 or higher.</font></p>
</body>
-</html> \ No newline at end of file
+</html>