summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-01-14 11:55:24 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-01-14 11:55:24 +0000
commit77a338e180fd51811041363f615760a14a2dc889 (patch)
tree8edab9c877db4c25e6291d68f833b5bd4e6feb57 /doc
parentdd36718bd11c85af49546ab589fa42bf512075ce (diff)
downloadrsyslog-77a338e180fd51811041363f615760a14a2dc889.tar.gz
rsyslog-77a338e180fd51811041363f615760a14a2dc889.tar.xz
rsyslog-77a338e180fd51811041363f615760a14a2dc889.zip
- implemented $MainMsgQueueTimeoutActionCompletion config directive
- implemented $MainMsgQueueTimeoutEnqueue config directive - implemented $MainMsgQueueTimeoutShutdown config directive - some cleanup
Diffstat (limited to 'doc')
-rw-r--r--doc/rsyslog_conf.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index ee54c00f..0018ca50 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -64,6 +64,9 @@ development and quite unstable...). So you have been warned ;)</p>
<li>$MainMsgQueueImmediateShutdown [on/<b>off</b>]</li>
<li><a href="rsconf1_mainmsgqueuesize.html">$MainMsgQueueSize</a></li>
<li>$MainMsgQueueMaxFileSize &lt;size_nbr&gt;, default 1m</li>
+ <li>$MainMsgQueueTimeoutActionCompletion &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 1000, 0 means immediate!]</li>
+ <li>$MainMsgQueueTimeoutEnqueue &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 2000, 0 means indefinite]</li>
+ <li>$MainMsgQueueTimeoutShutdown &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 0 (indefinite)]</li>
<li>$MainMsgQueueType [<b>FixedArray</b>/LinkedList/Direct/Disk]</li>
<li>$MainMsgQueueWorkerThreads &lt;number&gt;, num worker threads, default 1,
recommended 1</li>