summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-07-08 17:01:15 +0200
committerThomas Haller <thaller@redhat.com>2015-07-14 15:52:50 +0200
commitd0345ede266fa361e07bbd337be33517ede442c5 (patch)
treeb8de60daf79a9e4e2253bfe6f0bc74f0555ea023
parent9020cd1aacf26a03cf1bc46b040d42a791a89935 (diff)
downloadNetworkManager-d0345ede266fa361e07bbd337be33517ede442c5.tar.gz
logging: allow calling nm_logging_syslog_openlog() only once
-rw-r--r--src/nm-logging.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nm-logging.c b/src/nm-logging.c
index d4fe998ecf..f6936e8243 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -473,18 +473,18 @@ nm_log_handler (const gchar *log_domain,
void
nm_logging_syslog_openlog (gboolean debug)
{
+ if (syslog_opened)
+ g_return_if_reached ();
+ syslog_opened = TRUE;
+
if (debug)
openlog (G_LOG_DOMAIN, LOG_CONS | LOG_PERROR | LOG_PID, LOG_USER);
else
openlog (G_LOG_DOMAIN, LOG_PID, LOG_DAEMON);
- if (!syslog_opened) {
- syslog_opened = TRUE;
-
- g_log_set_handler (G_LOG_DOMAIN,
- G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
- nm_log_handler,
- NULL);
- }
+ g_log_set_handler (G_LOG_DOMAIN,
+ G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
+ nm_log_handler,
+ NULL);
}