summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-01-31 17:21:08 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-01-31 17:21:08 +0000
commit8039c08300f8ff05058c2f71299337db062937bf (patch)
tree7cd4d630ca7ccf464e69ad36cd4d89ae2ee07b60
parent9453336552a6cfa5de4ff1ffc7a474eade34aa27 (diff)
downloadrsyslog-8039c08300f8ff05058c2f71299337db062937bf.tar.gz
rsyslog-8039c08300f8ff05058c2f71299337db062937bf.tar.xz
rsyslog-8039c08300f8ff05058c2f71299337db062937bf.zip
preparing for 3.11.0v3-11-0
-rw-r--r--ChangeLog9
-rw-r--r--doc/rsyslog_conf.html18
-rw-r--r--doc/status.html8
3 files changed, 25 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index a2f4be78..bcf5332e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
---------------------------------------------------------------------------
-Version 3.11.0 (rgerhards), 2008-01-??
+Version 3.11.0 (rgerhards), 2008-01-31
+- implemented queued actions
+- implemented simple rate limiting for actions
+- implemented deliberate discarding of lower priority messages over higher
+ priority ones when a queue runs out of space
+- implemented disk quotas for disk queues
- implemented the $ActionResumeRetryCount config directive
-- implemented simple output rate limiting
- added $ActionQueueFilename config directive
- added $ActionQueueSize config directive
- added $ActionQueueHighWaterMark config directive
@@ -33,6 +37,7 @@ Version 3.11.0 (rgerhards), 2008-01-??
better with the new queued action mode (fast startup)
- fixed a bug that caused a potential hang in file and fwd output module
varmojfekoj provided the patch - many thanks!
+- bugfixed stream class offset handling on 32bit platforms
---------------------------------------------------------------------------
Version 3.10.3 (rgerhards), 2008-01-28
- fixed a bug with standard template definitions (not a big deal) - thanks
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 &lt;number&gt;</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>
<li>$ActionQueueDiscardMark &lt;number&gt; [default 9750]</li>
<li>$ActionQueueDiscardSeverity &lt;number&gt; [*numerical* severity! default 4 (warning)]</li>
<li>$ActionQueueFileName &lt;name&gt;</li>
@@ -46,7 +49,7 @@ it is usually well-choosen and applicable in most cases.</p>
<li>$ActionQueueTimeoutActionCompletion &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 1000, 0 means immediate!]</li>
<li>$ActionQueueTimeoutEnqueue &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 2000, 0 means indefinite]</li>
<li>$ActionQueueTimeoutShutdown &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 0 (indefinite)]</li>
- <li>$ActionQueueTimeoutWorkerThreadShutdown &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 60000 (1 minute)]</li>
+ <li>$ActionQueueWorkerTimeoutThreadShutdown &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 60000 (1 minute)]</li>
<li>$ActionQueueType [FixedArray/LinkedList/<b>Direct</b>/Disk]</li>
<li>$ActionQueueSaveOnShutdown&nbsp; [on/<b>off</b>]
<li>$ActionQueueWorkerThreads &lt;number&gt;, 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 &lt;number&gt;</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>
<li>$MainMsgQueueDiscardMark &lt;number&gt; [default 9750]</li>
<li>$MainMsgQueueDiscardSeverity &lt;number&gt; [*numerical* severity! default 4 (warning)]</li>
<li>$MainMsgQueueFileName &lt;name&gt;</li>
@@ -93,7 +99,7 @@ it is usually well-choosen and applicable in most cases.</p>
<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>$MainMsgQueueTimeoutWorkerThreadShutdown &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 60000 (1 minute)]</li>
+ <li>$MainMsgQueueWorkerTimeoutThreadShutdown &lt;number&gt; [number is timeout in ms (1000ms is 1sec!), default 60000 (1 minute)]</li>
<li>$MainMsgQueueType [<b>FixedArray</b>/LinkedList/Direct/Disk]</li>
<li>$MainMsgQueueSaveOnShutdown&nbsp; [on/<b>off</b>]
<li>$MainMsgQueueWorkerThreads &lt;number&gt;, 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 &quot;1000&quot; or &quot;1,000&quot; with the same result. Please note that rsyslogd
+simply ignores the punctuation. Form it's point of view, &quot;1,,0.0.,.,0&quot; 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 &quot;normal&quot; 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