summaryrefslogtreecommitdiff
path: root/src/nm-iface-helper.c
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2017-03-01 13:34:32 +0100
committerLubomir Rintel <lkundrak@v3.sk>2017-03-24 12:42:09 +0100
commit03a3fd901486aa40b41f2aa066ce1ea832f0f965 (patch)
tree100ebb67156b2da0748634e629ec818f52faaf0f /src/nm-iface-helper.c
parentb11b6038792a3da3f47717129580d7c661140291 (diff)
downloadNetworkManager-03a3fd901486aa40b41f2aa066ce1ea832f0f965.tar.gz
logging: respect choice of journal/syslog even with --debug
Previously, the daemon would just use syslog with LOG_PERROR when run with --debug option, even when actually configured to log into the journal. Let's respect the configuration, but preserve the logging to stderr.
Diffstat (limited to 'src/nm-iface-helper.c')
-rw-r--r--src/nm-iface-helper.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 4405c32542..6c09467e4a 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -432,9 +432,8 @@ main (int argc, char *argv[])
gl.main_loop = g_main_loop_new (NULL, FALSE);
setup_signals ();
- nm_logging_syslog_openlog (global_opt.logging_backend
- ? global_opt.logging_backend
- : (global_opt.debug ? "debug" : NULL));
+ nm_logging_syslog_openlog (global_opt.logging_backend,
+ global_opt.debug);
_LOGI (LOGD_CORE, "nm-iface-helper (version " NM_DIST_VERSION ") is starting...");