From 6569ae456bebcad691c3af924620c913616571f7 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 09:11:30 +0200 Subject: doc: v3 compatibility doc lists invalid config directive closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365 --- doc/v3compatibility.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v3compatibility.html b/doc/v3compatibility.html index ad8776bb..1c153506 100644 --- a/doc/v3compatibility.html +++ b/doc/v3compatibility.html @@ -84,7 +84,7 @@ to support this feature (as long as it is not totally removed). To replace it, use the following config directives (compatibility mode auto-generates them):

$ModLoad immark
-$MarkMessageInterval 1800 # 30 minutes

+$MarkMessagePeriod 1800 # 30 minutes

-r Option

Is no longer available in native mode. However, it is -- cgit v1.2.3 From be7bd9b4717a50db47e19edd4cd6ff897ff0a2ec Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 09:22:55 +0200 Subject: doc: remove BSD blocks from rsyslog.conf manpage Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364 --- tools/rsyslog.conf.5 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 index dcc9b7c7..641ba9ba 100644 --- a/tools/rsyslog.conf.5 +++ b/tools/rsyslog.conf.5 @@ -17,7 +17,7 @@ .\" along with this program; if not, write to the Free Software .\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. .\" -.TH RSYSLOG.CONF 5 "11 July 2008" "Version 3.18.0" "Linux System Administration" +.TH RSYSLOG.CONF 5 "22 October 2012" "Version 7.2.0" "Linux System Administration" .SH NAME rsyslog.conf \- rsyslogd(8) configuration file .SH DESCRIPTION @@ -335,13 +335,6 @@ Rsyslog offers three different types "filter conditions": * expression-based filters .RE -.SS Blocks -Rsyslogd supports BSD-style blocks inside rsyslog.conf. Each block of lines is separated from -the previous block by a program or hostname specification. A block will only log messages -corresponding to the most recent program and hostname specifications given. Thus, a block which -selects "ppp" as the program, directly followed by a block that selects messages from the -hostname "dialhost", then the second block will only log messages from the ppp program on dialhost. - .SS Selectors .B Selectors are the traditional way of filtering syslog messages. They have been kept in rsyslog with their original syntax, because it is well-known, highly -- cgit v1.2.3 From 3d0122be52faa6009f43f151a1ca24cf30ef12cc Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 10:19:54 +0200 Subject: disable deprecated warnings in omdiscard/omruleset ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem. --- plugins/omruleset/omruleset.c | 4 ++++ tools/omdiscard.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c index 6c770c94..d1d6eb00 100644 --- a/plugins/omruleset/omruleset.c +++ b/plugins/omruleset/omruleset.c @@ -165,8 +165,12 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) p += sizeof(":omruleset:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ CHKiRet(createInstance(&pData)); + /* re-enable in v7.3: requires action list to support + * action-like statements, something that is too late to + * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: omruleset is deprecated, consider " "using the 'call' statement instead"); + */ /* check if a non-standard template is to be applied */ if(*(p-1) == ';') diff --git a/tools/omdiscard.c b/tools/omdiscard.c index 15c6ea82..08cd7491 100644 --- a/tools/omdiscard.c +++ b/tools/omdiscard.c @@ -95,9 +95,13 @@ CODE_STD_STRING_REQUESTparseSelectorAct(0) if(*p == '~') { dbgprintf("discard\n"); + /* re-enable in v7.3: requires action list to support + * action-like statements, something that is too late to + * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: ~ action " "is deprecated, consider using the 'stop' " "statement instead"); + */ } else { iRet = RS_RET_CONFLINE_UNPROCESSED; } -- cgit v1.2.3