diff options
| -rw-r--r-- | doc/v3compatibility.html | 2 | ||||
| -rw-r--r-- | plugins/omruleset/omruleset.c | 4 | ||||
| -rw-r--r-- | tools/omdiscard.c | 4 | ||||
| -rw-r--r-- | tools/rsyslog.conf.5 | 9 |
4 files changed, 10 insertions, 9 deletions
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):</p> <p><b>$ModLoad immark<br> -$MarkMessageInterval 1800 # 30 minutes</b></p> +$MarkMessagePeriod 1800 # 30 minutes</b></p> <h2>-r Option</h2> <p>Is no longer available in native mode. However, it is 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; } 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 |