summaryrefslogtreecommitdiff
path: root/man/NetworkManager.conf.xml
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-06-21 09:21:57 +0200
committerThomas Haller <thaller@redhat.com>2018-06-27 09:21:33 +0200
commitdbd48f260ee2cb19329158c85e4a4a032538845c (patch)
treeafa093ddec14ceaf4b6d2bde94b50e992cab9395 /man/NetworkManager.conf.xml
parenta64b424da392e75f0a636e1f0d9029beddf771c2 (diff)
downloadNetworkManager-dbd48f260ee2cb19329158c85e4a4a032538845c.tar.gz
logging: warn about invalid logging backends and drop "debug" backend
"debug" was documentation in `man NetworkManager.conf` as a valid logging backend. However, it was completely ignored by nm_logging_syslog_openlog(). In fact, it makes not sense. Passing debug = TRUE to nm_logging_syslog_openlog(), means that all messages will be printed to stderr in addition to syslog/journal. However, when NetworkManager is daemonizing, stderr is closed. Whether NetworkManager is daemonizing depends entirely on command line options --no-daemon and --debug. Hence, the logging backend "debug" from the configuration file either conflicts or is redundant. Also, adjust logging backend description in `man NetworkManager.conf`. Also, log a warning about invalid/unsupported logging backend. (cherry picked from commit 2ccf6168dc1c54fde350ec669b777c29d566fb4a)
Diffstat (limited to 'man/NetworkManager.conf.xml')
-rw-r--r--man/NetworkManager.conf.xml10
1 files changed, 4 insertions, 6 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index e2c6562bc6..17bc42f34b 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -603,12 +603,10 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
<varlistentry>
<term><varname>backend</varname></term>
<listitem><para>The logging backend. Supported values
- are "<literal>debug</literal>", "<literal>syslog</literal>",
- "<literal>journal</literal>".
- "<literal>debug</literal>" uses syslog and logs to standard error.
- If NetworkManager is started in debug mode (<literal>--debug</literal>)
- this option is ignored and "<literal>debug</literal>" is always used.
- Otherwise, the default is "<literal>&NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT;</literal>".
+ are "<literal>syslog</literal>" and "<literal>journal</literal>".
+ When NetworkManager is started with "<literal>--debug</literal>"
+ in addition all messages will be printed to stderr.
+ If unspecified, the default is "<literal>&NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT;</literal>".
</para></listitem>
</varlistentry>
<varlistentry>