From ed26762e13a50a9802db933b12ddfc28c98cf4ad Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Mar 2015 23:24:05 +0100 Subject: [PATCH] main: (order) set g_log_set_always_fatal() early on After parsing the cmd line options, we already can setup fatal glog level. (cherry picked from commit c50622c84566363c6a0309150800c660c7fd589b) --- src/main.c | 16 ++++++++-------- src/nm-iface-helper.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main.c b/src/main.c index 87503831b1..d95cdce4d0 100644 --- a/src/main.c +++ b/src/main.c @@ -264,6 +264,14 @@ main (int argc, char *argv[]) do_early_setup (&argc, &argv); + if (global_opt.g_fatal_warnings) { + GLogLevelFlags fatal_mask; + + fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); + fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL; + g_log_set_always_fatal (fatal_mask); + } + if (global_opt.show_version) { fprintf (stdout, NM_DIST_VERSION "\n"); exit (0); @@ -375,14 +383,6 @@ main (int argc, char *argv[]) if (!nm_main_utils_setup_signals (main_loop, &quit_early)) exit (1); - if (global_opt.g_fatal_warnings) { - GLogLevelFlags fatal_mask; - - fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); - fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL; - g_log_set_always_fatal (fatal_mask); - } - nm_logging_syslog_openlog (global_opt.debug); dbus_threads_init_default (); diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 078ee315c2..802b50a241 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -357,6 +357,14 @@ main (int argc, char *argv[]) do_early_setup (&argc, &argv); + if (global_opt.g_fatal_warnings) { + GLogLevelFlags fatal_mask; + + fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); + fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL; + g_log_set_always_fatal (fatal_mask); + } + if (global_opt.show_version) { fprintf (stdout, NM_DIST_VERSION "\n"); exit (0); @@ -405,14 +413,6 @@ main (int argc, char *argv[]) main_loop = g_main_loop_new (NULL, FALSE); setup_signals (&quit_early); - if (global_opt.g_fatal_warnings) { - GLogLevelFlags fatal_mask; - - fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); - fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL; - g_log_set_always_fatal (fatal_mask); - } - nm_logging_syslog_openlog (global_opt.debug); nm_log_info (LOGD_CORE, "nm-iface-helper (version " NM_DIST_VERSION ") is starting...");