diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-31 17:21:08 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-31 17:21:08 +0000 |
| commit | 8039c08300f8ff05058c2f71299337db062937bf (patch) | |
| tree | 7cd4d630ca7ccf464e69ad36cd4d89ae2ee07b60 /doc | |
| parent | 9453336552a6cfa5de4ff1ffc7a474eade34aa27 (diff) | |
| download | rsyslog-8039c08300f8ff05058c2f71299337db062937bf.tar.gz rsyslog-8039c08300f8ff05058c2f71299337db062937bf.tar.xz rsyslog-8039c08300f8ff05058c2f71299337db062937bf.zip | |
preparing for 3.11.0v3-11-0
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rsyslog_conf.html | 18 | ||||
| -rw-r--r-- | doc/status.html | 8 |
2 files changed, 18 insertions, 8 deletions
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html index c086bbc6..f2b2f6ba 100644 --- a/doc/rsyslog_conf.html +++ b/doc/rsyslog_conf.html @@ -29,12 +29,15 @@ them are in bold. A more in-depth description will appear as implementation progresses. Directives may change during that process, we will NOT try hard to maintain backwards compatibility (after all, v3 is still very early in development and quite unstable...). So you have been warned ;)</p> -<p>Be sure to read information about <a href="queues.html">queues in rsyslog</a> +<p><b>Be sure to read information about <a href="queues.html">queues in rsyslog</a></b> - many parameter settings modify queue parameters. If in doubt, use the default, -it is usually well-choosen and applicable in most cases.</p> +it is usually well-chosen and applicable in most cases.</p> <ul> <li><a href="rsconf1_actionexeconlyifpreviousissuspended.html">$ActionExecOnlyIfPreviousIsSuspended</a></li> <li>$ActionQueueCheckpointInterval <number></li> + <li>$ActionQueueDequeueSlowdown <number> [number is timeout in <i> + micro</i>seconds (1000000us is 1sec!), default 0 (no delay). Simple + rate-limiting!]</li> <li>$ActionQueueDiscardMark <number> [default 9750]</li> <li>$ActionQueueDiscardSeverity <number> [*numerical* severity! default 4 (warning)]</li> <li>$ActionQueueFileName <name></li> @@ -46,7 +49,7 @@ it is usually well-choosen and applicable in most cases.</p> <li>$ActionQueueTimeoutActionCompletion <number> [number is timeout in ms (1000ms is 1sec!), default 1000, 0 means immediate!]</li> <li>$ActionQueueTimeoutEnqueue <number> [number is timeout in ms (1000ms is 1sec!), default 2000, 0 means indefinite]</li> <li>$ActionQueueTimeoutShutdown <number> [number is timeout in ms (1000ms is 1sec!), default 0 (indefinite)]</li> - <li>$ActionQueueTimeoutWorkerThreadShutdown <number> [number is timeout in ms (1000ms is 1sec!), default 60000 (1 minute)]</li> + <li>$ActionQueueWorkerTimeoutThreadShutdown <number> [number is timeout in ms (1000ms is 1sec!), default 60000 (1 minute)]</li> <li>$ActionQueueType [FixedArray/LinkedList/<b>Direct</b>/Disk]</li> <li>$ActionQueueSaveOnShutdown [on/<b>off</b>] <li>$ActionQueueWorkerThreads <number>, num worker threads, default 1, @@ -82,6 +85,9 @@ it is usually well-choosen and applicable in most cases.</p> -2 option</li> <li>$klogSymbolsTwice (imklog) [on/<b>off</b>] -- former klogd -s option</li> <li>$MainMsgQueueCheckpointInterval <number></li> + <li>$MainMsgQueueDequeueSlowdown <number> [number is timeout in <i> + micro</i>seconds (1000000us is 1sec!), default 0 (no delay). Simple + rate-limiting!]</li> <li>$MainMsgQueueDiscardMark <number> [default 9750]</li> <li>$MainMsgQueueDiscardSeverity <number> [*numerical* severity! default 4 (warning)]</li> <li>$MainMsgQueueFileName <name></li> @@ -93,7 +99,7 @@ it is usually well-choosen and applicable in most cases.</p> <li>$MainMsgQueueTimeoutActionCompletion <number> [number is timeout in ms (1000ms is 1sec!), default 1000, 0 means immediate!]</li> <li>$MainMsgQueueTimeoutEnqueue <number> [number is timeout in ms (1000ms is 1sec!), default 2000, 0 means indefinite]</li> <li>$MainMsgQueueTimeoutShutdown <number> [number is timeout in ms (1000ms is 1sec!), default 0 (indefinite)]</li> - <li>$MainMsgQueueTimeoutWorkerThreadShutdown <number> [number is timeout in ms (1000ms is 1sec!), default 60000 (1 minute)]</li> + <li>$MainMsgQueueWorkerTimeoutThreadShutdown <number> [number is timeout in ms (1000ms is 1sec!), default 60000 (1 minute)]</li> <li>$MainMsgQueueType [<b>FixedArray</b>/LinkedList/Direct/Disk]</li> <li>$MainMsgQueueSaveOnShutdown [on/<b>off</b>] <li>$MainMsgQueueWorkerThreads <number>, num worker threads, default 1, @@ -118,6 +124,10 @@ number part. For example, 1k means 1024. Supported are k(ilo), m(ega), g(iga), t(era), p(eta) and e(xa). Lower case letters refer to the traditional binary defintion (e.g. 1m equals 1,048,576) whereas upper case letters refer to their new 1000-based definition (e.g 1M equals 1,000,000).</p> +<p>Numbers may include '.' and ',' for readability. So you can for example +specify either "1000" or "1,000" with the same result. Please note that rsyslogd +simply ignores the punctuation. Form it's point of view, "1,,0.0.,.,0" also has +the value 1000. </p> <h2>Basic Structure</h2> <p>Rsyslog supports standard sysklogd's configuration file format and extends it. So in general, you can take a "normal" syslog.conf and use it together with diff --git a/doc/status.html b/doc/status.html index fd483f8d..5e730931 100644 --- a/doc/status.html +++ b/doc/status.html @@ -4,11 +4,11 @@ </head> <body> <h2>rsyslog status page</h2> -<p>This page reflects the status as of 2008-01-28.</p> +<p>This page reflects the status as of 2008-01-31.</p> <h2>Current Releases</h2> -<p><b>development:</b> 3.10.3 - -<a href="http://www.rsyslog.com/Article167.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-75.phtml">download</a></p> +<p><b>development:</b> 3.11.0 - +<a href="http://www.rsyslog.com/Article169.phtml">change log</a> - +<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-76.phtml">download</a></p> <p><b><font color="#FF0000"><a href="v3compatibility.html">Be sure to read the rsyslog v3 compatibility document!</a></font></b><br> Documentation for 3.x is currently sparse. If you need assistance, please |