diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-03-13 23:24:05 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-03-19 16:29:55 +0100 |
| commit | d9646361de9bc56797586820674687758a49591a (patch) | |
| tree | e2f01d5084696fc2aa34dd25b9c02d4b3935b4c6 | |
| parent | c70a04d84052ce455a52a5a1e830dd118f4866fe (diff) | |
| download | NetworkManager-d9646361de9bc56797586820674687758a49591a.tar.gz | |
main: (order) set g_log_set_always_fatal() early on
After parsing the cmd line options, we already can setup fatal glog
level.
| -rw-r--r-- | src/main.c | 16 | ||||
| -rw-r--r-- | src/nm-iface-helper.c | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/main.c b/src/main.c index f5c4b40272..c7e4b2a97f 100644 --- a/src/main.c +++ b/src/main.c @@ -270,6 +270,14 @@ main (int argc, char *argv[]) config_cli = nm_config_cmd_line_options_new (); do_early_setup (&argc, &argv, config_cli); + 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); @@ -382,14 +390,6 @@ main (int argc, char *argv[]) /* Set up unix signal handling - before creating threads, but after daemonizing! */ nm_main_utils_setup_signals (main_loop); - 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 4ea473d071..66efefc40d 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -354,6 +354,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); @@ -402,14 +410,6 @@ main (int argc, char *argv[]) main_loop = g_main_loop_new (NULL, FALSE); setup_signals (); - 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..."); |