summaryrefslogtreecommitdiff
path: root/data/NetworkManager.service.in
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2013-05-17 15:18:03 -0400
committerDan Winship <danw@gnome.org>2013-05-21 09:30:09 -0300
commit8d44136dce3de1becd11e798edfc3f1eb3f4a36f (patch)
tree7fa4698ce75f92f7f053ba9738c5536acaa10581 /data/NetworkManager.service.in
parent7ff3d1500e8a9dcce4d12b7b879bf1d178b94bf8 (diff)
downloadNetworkManager-8d44136dce3de1becd11e798edfc3f1eb3f4a36f.tar.gz
main: add --debug, fix logging under systemd
When run with --no-daemon, NM used to duplicate all syslog output to stderr, for ease of debugging. But this meant it had to tell systemd to ignore stderr, so you wouldn't get duplicated log entries. But that meant we lost error messages that didn't go through nm_log. (eg, g_warning()s and g_return_if_fail()s). Fix this by making --no-daemon no longer duplicate syslog output to stderr, and removing the "StandardError=null" from the systemd service file. To get the old behavior, you can use --debug instead of --no-daemon. https://bugzilla.gnome.org/show_bug.cgi?id=700550
Diffstat (limited to 'data/NetworkManager.service.in')
-rw-r--r--data/NetworkManager.service.in4
1 files changed, 0 insertions, 4 deletions
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 16b53b68f3..f1a2b09b14 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -8,10 +8,6 @@ Before=network.target
Type=dbus
BusName=org.freedesktop.NetworkManager
ExecStart=@sbindir@/NetworkManager --no-daemon
-# Suppress stderr to eliminate duplicated messages in syslog. NM calls openlog()
-# with LOG_PERROR when run in foreground. But systemd redirects stderr to
-# syslog by default, which results in logging each message twice.
-StandardError=null
# NM doesn't want systemd to kill its children for it
KillMode=process