diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 14:21:35 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 14:21:35 +0100 |
| commit | 7dfc7c709ffe09669e8c79661faea21451cca603 (patch) | |
| tree | 9e9367b2263734885ece3be9b7d68b8bab0a5926 /doc | |
| parent | 409cd9496b08be6270c69e34374e94379ed0e4b9 (diff) | |
| parent | e6e1ff65bcb577df238c9c24d55909bca6febbb3 (diff) | |
| download | rsyslog-7dfc7c709ffe09669e8c79661faea21451cca603.tar.gz rsyslog-7dfc7c709ffe09669e8c79661faea21451cca603.tar.xz rsyslog-7dfc7c709ffe09669e8c79661faea21451cca603.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
doc/v6compatibility.html
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 1 | ||||
| -rw-r--r-- | doc/rsyslog_conf_actions.html | 2 | ||||
| -rw-r--r-- | doc/scoping.html | 39 | ||||
| -rw-r--r-- | doc/v6compatibility.html | 3 |
4 files changed, 2 insertions, 43 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index fe96f960..04fda6b3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,6 @@ html_files = \ index.html \ bugs.html \ debug.html \ - scoping.html \ features.html \ generic_design.html \ expression.html \ diff --git a/doc/rsyslog_conf_actions.html b/doc/rsyslog_conf_actions.html index 2bcb4146..2e2293ce 100644 --- a/doc/rsyslog_conf_actions.html +++ b/doc/rsyslog_conf_actions.html @@ -8,8 +8,6 @@ message. In general, message content is written to a kind of "logfile". But also other actions might be done, like writing to a database table or forwarding to another host.<br> -<p>Please be sure to read about <a href="scoping.html">rsyslog config scoping</a> -in combination with this document. <br> Templates can be used with all actions. If used, the specified template is used to generate the message content (instead of the default diff --git a/doc/scoping.html b/doc/scoping.html deleted file mode 100644 index be80e922..00000000 --- a/doc/scoping.html +++ /dev/null @@ -1,39 +0,0 @@ -<html><head> -<title>rsyslog configuration scoping</title></head> -<body> -<h1>rsyslog configuration scoping</h1> -<p>Starting with version 6.1.0, <a href="http://www.rsyslog.com">rsyslog</a> supports -different scopes inside rsyslog.conf. -Earlier versions had only a single, global scope, where each configuration command affected that global -scope. -This resulted in rather complex configurations. Also many users, even the rsyslog authors, were sometimes -not sure what belonged together. So we started an effort to redo the configuration language. -The initial effort, available in 6.1.0, is scoping for actions. Now, an action can be defined -in its own scope and it will always get a fresh environment, not affected by any config -settings outside of that action definition. Similarly, config statements issues within the -scope do not affect the global scope. This is the recommended ways of defining actions. -<p>However, the previous mode is still supported and any valid pre-v6 config is a valid v6 config -as well. For those interested in more strict scoping, the "$StrictScoping on" directive can -be used to force the use of scopes inside rsyslog.conf. If given, actions and action directives -can not be specified outside of action scopes. -<p>Nestings of scope is not permitted. Each $Begin must be matched by a $End. This is currently not -enforced in all cases (end of file), but is considered a syntax error which later versions of rsyslog -will most probably detect. -<p>Note that scoping is in its infancy. Expect changes, and most importantly enhancements. Currently, -scoping is only supported for actions. As a next step, scoping for inputs is planned. Feedback -on the scoping feature is appreciated. -<h2>Scoping Config Statements</h2> -<ul> -<li><b>$StrictScoping</b> [on/<b>off</b>] - enable strict scoping as described above. -<li><b>$Begin</b> <object> - Begin definitions for the specified object. Inside the scope -only object-specific directives can be given. Currently, only the object type "action" is supported -(note that the object name is case-insensitive). -<li><b>$End</b> <object> - End definitions for the object. Global scope is restored. -</ul> -<p>[<a href="manual.html">manual index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p> -<p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a> -project.<br> -Copyright © 2010 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and -<a href="http://www.adiscon.com/">Adiscon</a>. -Released under the GNU GPL version 3 or higher.</font></p> -</body></html> diff --git a/doc/v6compatibility.html b/doc/v6compatibility.html index e682c56b..1f830854 100644 --- a/doc/v6compatibility.html +++ b/doc/v6compatibility.html @@ -42,7 +42,8 @@ much coding. However, if the new config language shall be supported, more changes must be made to plugin code. All project-supported plugins have been upgraded, so this compatibility issue is only of interest for you if you have custom plugins or use some user-contributed plugins from the rsyslog project -that are not maintained by the project itself (omoracle is an example). +that are not maintained by the project itself (omoracle is an example). Please +expect some further plugin instablity during the initial v6 releases. <h2>RainerScript based rsyslog.conf</h2> <p>A better config format was the main release target for rsyslog v6. It comes in the flavor of so-called RainerScript |