summaryrefslogtreecommitdiffstats
path: root/doc/rsyslog_conf_global.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-03 12:05:50 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-03 12:05:50 +0200
commit22328c72aef2df73741afefe0e8b53d3ad83f15d (patch)
tree4a0b311508ebb28a0dc72e12993f704c2709d46a /doc/rsyslog_conf_global.html
parentda933a7e105acf814d5e7955d39d29eab3a96613 (diff)
parent7c0ca7553738161c681c0d0600de99e9fabee81d (diff)
downloadrsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.gz
rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.xz
rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.zip
Merge branch 'v5-devel'
Conflicts: ChangeLog runtime/datetime.c
Diffstat (limited to 'doc/rsyslog_conf_global.html')
-rw-r--r--doc/rsyslog_conf_global.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html
index 03842758..2371c4ae 100644
--- a/doc/rsyslog_conf_global.html
+++ b/doc/rsyslog_conf_global.html
@@ -58,6 +58,7 @@ default template for UDP and plain TCP forwarding action</li>
<li>$ActionGSSForwardDefaultTemplate [templateName] - sets a
new default template for GSS-API forwarding action</li>
<li>$ActionQueueCheckpointInterval &lt;number&gt;</li>
+<li>$ActionQueueDequeueBatchSize &lt;number&gt; [default 16]</li>
<li>$ActionQueueDequeueSlowdown &lt;number&gt; [number
is timeout in <i> micro</i>seconds (1000000us is 1sec!),
default 0 (no delay). Simple rate-limiting!]</li>
@@ -135,6 +136,7 @@ not recommended for use with rsyslog. To do a full restart, simply stop and star
compatibility reasons. If it is set to "off", a HUP will only close open files. This is a much quicker action and usually
the only one that is needed e.g. for log rotation. <b>It is recommended to set the setting to "off".</b></li>
<li><a href="rsconf1_includeconfig.html">$IncludeConfig</a></li><li>MainMsgQueueCheckpointInterval &lt;number&gt;</li>
+<li>$MainMsgQueueDequeueBatchSize &lt;number&gt; [default 32]</li>
<li>$MainMsgQueueDequeueSlowdown &lt;number&gt; [number
is timeout in <i> micro</i>seconds (1000000us is 1sec!),
default 0 (no delay). Simple rate-limiting!]</li>