diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:29:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:29:00 +0200 |
| commit | f4156b878f5e29d13bc4d98b78a7063008c6ad2b (patch) | |
| tree | a57cf718162aca1a9f24d5347d25a46ec0ef6996 /doc/rsyslog_conf_global.html | |
| parent | cbdc18da79c2ee672ef59e443a9c0039fdf87bc1 (diff) | |
| parent | 7dcd960d30e8a31ad5f29ecc17fe276b95873a3d (diff) | |
| download | rsyslog-f4156b878f5e29d13bc4d98b78a7063008c6ad2b.tar.gz rsyslog-f4156b878f5e29d13bc4d98b78a7063008c6ad2b.tar.xz rsyslog-f4156b878f5e29d13bc4d98b78a7063008c6ad2b.zip | |
Merge branch 'v4-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf_global.html
tools/syslogd.c
Diffstat (limited to 'doc/rsyslog_conf_global.html')
| -rw-r--r-- | doc/rsyslog_conf_global.html | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index fa9c7eef..7d2f2c4d 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -92,10 +92,13 @@ default 60000 (1 minute)]</li> <li><a href="rsconf1_actionresumeinterval.html">$ActionResumeInterval</a></li> <li>$ActionResumeRetryCount <number> [default 0, -1 means eternal]</li> <li>$ActionSendResendLastMsgOnReconn <[on/<b>off</b>]> specifies if the last message is to be resend when a connecition broken and has been reconnedcted. May increase reliability, but comes at the risk of message duplication. -<li>$ActionSendStreamDriver <driver basename> just like $DefaultNetstreamDriver, but for the specific action -</li><li>$ActionSendStreamDriverMode <mode>, default 0, mode to use with the stream driver -(driver-specific)</li><li>$ActionSendStreamDriverAuthMode <mode>, authentication mode to use with the stream driver -(driver-specific)</li><li>$ActionSendStreamDriverPermittedPeer <ID>, accepted fingerprint (SHA1) or name of remote peer +<li>$ActionSendStreamDriver <driver basename> just like $DefaultNetstreamDriver, but for the specific action</li> +<li>$ActionSendStreamDriverMode <mode>, default 0, mode to use with the stream driver (driver-specific)</li> +<li>$ActionSendStreamDriverAuthMode <mode>, authentication mode to use with the stream driver. Note that this directive requires TLS +netstream drivers. For all others, it will be ignored. +(driver-specific)</li> +<li>$ActionSendStreamDriverPermittedPeer <ID>, accepted fingerprint (SHA1) or name of remote peer. Note that this directive requires TLS +netstream drivers. For all others, it will be ignored. (driver-specific) -<span style="font-weight: bold;"> directive may go away</span>!</li> <li><b>$ActionSendTCPRebindInterval</b> nbr</a>- [available since 4.5.1] - instructs the TCP send action to close and re-open the connection to the remote host every nbr of messages sent. @@ -155,7 +158,11 @@ Usually that should not be a big issue, as the restart-type HUP can easily be re something along the lines of "/etc/init.d/rsyslog restart". </li> <li><a href="rsconf1_includeconfig.html">$IncludeConfig</a></li><li>MainMsgQueueCheckpointInterval <number></li> -<li>$MainMsgQueueDequeueBatchSize <number> [default 32]</li> +<li><b>$LogRSyslogStatusMessages</b> [<b>on</b>/off] - If set to on (the default), +rsyslog emits message on startup and shutdown as well as when it is HUPed. +This information might be needed by some log analyzers. If set to off, no such +status messages are logged, what may be useful for other scenarios. +<li><b>$MainMsgQueueDequeueBatchSize</b> <number> [default 32]</li> <li>$MainMsgQueueDequeueSlowdown <number> [number is timeout in <i> micro</i>seconds (1000000us is 1sec!), default 0 (no delay). Simple rate-limiting!]</li> |