diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 15:14:37 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 15:14:37 +0200 |
| commit | 05efee80c1f9ef74b912d12709919153b8d1440a (patch) | |
| tree | 64b2e4bd775f5af34be43e7f49559837bb8145ed /doc | |
| parent | 4c44b1f2addb9ac6a3f0da2fde1261e8e49fe1d8 (diff) | |
| parent | d749dadcc30e35448894a152fb0ddf77d60b8300 (diff) | |
| download | rsyslog-05efee80c1f9ef74b912d12709919153b8d1440a.tar.gz rsyslog-05efee80c1f9ef74b912d12709919153b8d1440a.tar.xz rsyslog-05efee80c1f9ef74b912d12709919153b8d1440a.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rsyslog_conf_global.html | 9 | ||||
| -rw-r--r-- | doc/v5compatibility.html | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index 21786a7f..83eb876b 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -152,15 +152,6 @@ our paper on <a href="multi_ruleset.html">using multiple rule sets in rsyslog</a <li><a href="rsconf1_gssforwardservicename.html">$GssForwardServiceName</a></li> <li><a href="rsconf1_gsslistenservicename.html">$GssListenServiceName</a></li> <li><a href="rsconf1_gssmode.html">$GssMode</a></li> -<li>$HUPisRestart [on/<b>off</b>] - if set to on, a HUP is a full daemon restart. This means any queued messages are discarded (depending -on queue configuration, of course) all modules are unloaded and reloaded. This mode keeps compatible with sysklogd, but is -not recommended for use with rsyslog. To do a full restart, simply stop and start the daemon. The default (since 4.5.1) is "off". -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>Restart-type HUPs (value "on") are depricated</b> -and will go away in rsyslog v5. So it is a good idea to change anything that needs it, now. -Usually that should not be a big issue, as the restart-type HUP can easily be replaced by -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><b>$LocalHostName</b> [name] - this directive permits to overwrite the system hostname with the one specified in the directive. If the directive is given diff --git a/doc/v5compatibility.html b/doc/v5compatibility.html index cc875b7b..fc4289c5 100644 --- a/doc/v5compatibility.html +++ b/doc/v5compatibility.html @@ -16,6 +16,7 @@ available. This processing was redundant and had a lot a drawbacks. For details, please see the <a href="v4compatibility.html">rsyslog v4 compatibility notes</a> which elaborate on the reasons and the (few) things you may need to change. +<p>Please note that starting with 5.8.11 HUP will also requery the local hostname. <h2>Queue on-disk format</h2> <p>The queue information file format has been changed. When upgrading from v4 to v5, make sure that the queue is emptied and no on-disk structure present. We did |