diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-21 09:21:57 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-06-27 09:21:33 +0200 |
| commit | dbd48f260ee2cb19329158c85e4a4a032538845c (patch) | |
| tree | afa093ddec14ceaf4b6d2bde94b50e992cab9395 /meson_options.txt | |
| parent | a64b424da392e75f0a636e1f0d9029beddf771c2 (diff) | |
| download | NetworkManager-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 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson_options.txt b/meson_options.txt index bafc676911..e97a773ac6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,7 +21,7 @@ option('modify_system', type: 'boolean', value: false, description: 'Allow users option('polkit_agent', type: 'boolean', value: false, description: 'enable polkit agent for clients') option('selinux', type: 'boolean', value: true, description: 'Build with SELinux') option('systemd_journal', type: 'boolean', value: true, description: 'Use systemd journal for logging') -option('config_logging_backend_default', type: 'combo', choices: ['default', 'debug', 'syslog', 'journal', 'journal-syslog-style'], value: 'default', description: 'Default value for logging.backend') +option('config_logging_backend_default', type: 'combo', choices: ['default', 'syslog', 'journal'], value: 'default', description: 'Default value for logging.backend') option('hostname_persist', type: 'combo', choices: ['default', 'suse', 'gentoo', 'slackware'], value: 'default', description: 'Hostname persist method') option('libaudit', type: 'combo', choices: ['yes', 'yes-disabled-by-default', 'no'], value: 'yes', description: 'Build with audit daemon support. yes-disabled-by-default enables support, but disables it unless explicitly configured via NetworkManager.conf') |