summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/queue_parameters.html7
-rw-r--r--doc/rsyslog_conf_actions.html26
2 files changed, 30 insertions, 3 deletions
diff --git a/doc/queue_parameters.html b/doc/queue_parameters.html
index 83eae5d3..f2af7598 100644
--- a/doc/queue_parameters.html
+++ b/doc/queue_parameters.html
@@ -4,6 +4,13 @@
<body>
<a href="rsyslog_conf_global.html">back</a>
<p><h2>General Queue Parameters</h2></p>
+<p>Queue parameters can be used together with the following statements:
+<ul>
+<li><a href="rsyslog_conf_actions.html">action()</a>
+<li>ruleset()</a>
+<li>main_queue()</a>
+</ul>
+<p>
Queues need to be configured in the action or ruleset it should affect. If nothing is configured,
default values will be used. Thus, the default ruleset has only the default main queue. Specific Action
queues are not set up by default.</p>
diff --git a/doc/rsyslog_conf_actions.html b/doc/rsyslog_conf_actions.html
index fa240d97..5d7a5bdb 100644
--- a/doc/rsyslog_conf_actions.html
+++ b/doc/rsyslog_conf_actions.html
@@ -3,9 +3,14 @@
<body>
<p>This is a part of the rsyslog.conf documentation.</p>
<a href="rsyslog_conf.html">back</a>
+<p><b><i>Note: this documentation describes features present in v7+ of
+rsyslog. If you use an older version, scroll down to "legacy parameters".</i></b>
+If you prefer, you can also
+<a href="http://www.rsyslog.com/how-to-obtain-a-specific-doc-version/">obtain
+a specific version of the rsyslog documentation</a>.
<h2>Actions</h2>
Action object describe what is to be done with a message. They are
-implemented via <a href="rsyslog_conf_modules.html#om">outpout modules</a>.
+implemented via <a href="rsyslog_conf_modules.html#om">output modules</a>.
<p>The action object has different parameters:
<ul>
<li>those that apply to all actions and are action specific. These
@@ -13,8 +18,11 @@ implemented via <a href="rsyslog_conf_modules.html#om">outpout modules</a>.
<li>parameters for the action queue. While they also apply to
all parameters, they are queue-specific, not action-specific (they
are the same that are used in rulesets, for example).
+ The are documented separately under
+ <a href="queue_parameters.html">queue parameters</a>.
<li>action-specific parameters. These are specific to a certain
- type of actions. They are documented by the output module
+ type of actions. They are documented by the
+ <a href="rsyslog_conf_modules.html#om">output module</a>
in question.
</ul>
<h3>General Action Parameters</h3>
@@ -47,7 +55,19 @@ When an action is suspended (e.g. destination can not be connected), the action
</ul>
-<h2>Legacy Format</h2>
+<h2>Useful Links</h2>
+<ul>
+<li>Rainer's blog posting on the performance of
+ <a href="http://blog.gerhards.net/2013/06/rsyslog-performance-main-and-action.html">main
+ and action queue worker threads</a>
+</ul>
+
+<br>
+<br>
+<br>
+
+
+<h1>Legacy Format</h1>
<p><b>Be warned that legacy action format is hard to get right. It is
recommended to use RainerScript-Style action format whenever possible!</b>
A key problem with legacy format is that a single action is defined via