From dbd48f260ee2cb19329158c85e4a4a032538845c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 21 Jun 2018 09:21:57 +0200 Subject: 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) --- man/NetworkManager.conf.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'man/NetworkManager.conf.xml') 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 backend The logging backend. Supported values - are "debug", "syslog", - "journal". - "debug" uses syslog and logs to standard error. - If NetworkManager is started in debug mode (--debug) - this option is ignored and "debug" is always used. - Otherwise, the default is "&NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT;". + are "syslog" and "journal". + When NetworkManager is started with "--debug" + in addition all messages will be printed to stderr. + If unspecified, the default is "&NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT;". -- cgit v1.2.1