From 14a7c82fadd27446af318c61cb46992802a3aa3c Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 11 Feb 2008 12:51:53 +0000 Subject: bugfix (doc): misspelled config directive, invalid signal info - thanks to Peter Vrabec for pointing this out --- ChangeLog | 1 + configure.ac | 2 +- ...sconf1_actionexeconlyifpreviousissuspended.html | 29 ---------------------- ...onf1_actionexeconlywhenpreviousissuspended.html | 29 ++++++++++++++++++++++ doc/rsyslog_conf.html | 2 +- rsyslogd.8 | 7 +----- 6 files changed, 33 insertions(+), 37 deletions(-) delete mode 100644 doc/rsconf1_actionexeconlyifpreviousissuspended.html create mode 100644 doc/rsconf1_actionexeconlywhenpreviousissuspended.html diff --git a/ChangeLog b/ChangeLog index 4f2f70a4..a1bba738 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ Version 2.0.2 STABLE (rgerhards), 2008-02-?? pointing out this problem. - bugfix: trailing ":" of tag was lost while parsing legacy syslog messages without timestamp - thanks to Anders Blomdell for providing a patch! +- bugfix (doc): misspelled config directive, invalid signal info --------------------------------------------------------------------------- Version 2.0.1 STABLE (rgerhards), 2008-01-24 - fixed a bug in integer conversion - but this function was never called, diff --git a/configure.ac b/configure.ac index 6ca8bb41..bb66bfd6 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],[2.0.1],[rsyslog@lists.adiscon.com.]) +AC_INIT([rsyslog],[2.0.2],[rsyslog@lists.adiscon.com.]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([syslogd.c]) AC_CONFIG_HEADERS([config.h]) diff --git a/doc/rsconf1_actionexeconlyifpreviousissuspended.html b/doc/rsconf1_actionexeconlyifpreviousissuspended.html deleted file mode 100644 index 2568ccfb..00000000 --- a/doc/rsconf1_actionexeconlyifpreviousissuspended.html +++ /dev/null @@ -1,29 +0,0 @@ - - -rsyslog.conf file - - -

$ActionExecOnlyIfPreviousIsSuspended

-

Type: global configuration directive

-

Default: off

-

Description:

-

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).

-

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.

-

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).

-

Sample:

-

*.* @@primary-syslog.example.com -
$ActionExecOnlyIfPreviousIsSuspended on -
& @@secondary-1-syslog.example.com # & is used to have more than one action for -
& @@secondary-2-syslog.example.com # the same selector - the mult-action feature -
& /var/log/localbuffer -
$ActionExecOnlyIfPreviousIsSuspended off # to re-set it for the next selector

- -

[rsyslog.conf overview] [manual -index] [rsyslog site]

-

This documentation is part of the -rsyslog project.
-Copyright © 2007 by Rainer Gerhards and -Adiscon. Released under the GNU GPL -version 2 or higher.

- - \ No newline at end of file diff --git a/doc/rsconf1_actionexeconlywhenpreviousissuspended.html b/doc/rsconf1_actionexeconlywhenpreviousissuspended.html new file mode 100644 index 00000000..2568ccfb --- /dev/null +++ b/doc/rsconf1_actionexeconlywhenpreviousissuspended.html @@ -0,0 +1,29 @@ + + +rsyslog.conf file + + +

$ActionExecOnlyIfPreviousIsSuspended

+

Type: global configuration directive

+

Default: off

+

Description:

+

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).

+

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.

+

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).

+

Sample:

+

*.* @@primary-syslog.example.com +
$ActionExecOnlyIfPreviousIsSuspended on +
& @@secondary-1-syslog.example.com # & is used to have more than one action for +
& @@secondary-2-syslog.example.com # the same selector - the mult-action feature +
& /var/log/localbuffer +
$ActionExecOnlyIfPreviousIsSuspended off # to re-set it for the next selector

+ +

[rsyslog.conf overview] [manual +index] [rsyslog site]

+

This documentation is part of the +rsyslog project.
+Copyright © 2007 by Rainer Gerhards and +Adiscon. Released under the GNU GPL +version 2 or higher.

+ + \ No newline at end of file diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html index 3ee2ae60..bf878e82 100644 --- a/doc/rsyslog_conf.html +++ b/doc/rsyslog_conf.html @@ -25,7 +25,7 @@ to rsyslogd.

start with a dollar-sign. Here is a list in alphabetical order. Follow links for a description.