diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-03 23:00:16 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-03 23:00:16 +0200 |
| commit | 511e94811644318cc196e197616fdc558030e8e3 (patch) | |
| tree | 1ea5c895be190982cc686d43ebed62ae33d60426 /src/main.c | |
| parent | fb15332b981b5637ae4aeadc546e2f46bf333cd1 (diff) | |
| parent | d6201f5d8daada3d64a0a3e0038e14eebec683ce (diff) | |
Merge tag 'upstream/1.2.4'
Upstream version 1.2.4
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 4616155d..e243baa8 100644 --- a/src/main.c +++ b/src/main.c @@ -188,14 +188,31 @@ _init_nm_debug (const char *debug) void nm_main_config_reload (int signal) { + NMConfigChangeFlags reload_flags; + + switch (signal) { + case SIGHUP: + reload_flags = NM_CONFIG_CHANGE_CAUSE_SIGHUP; + break; + case SIGUSR1: + reload_flags = NM_CONFIG_CHANGE_CAUSE_SIGUSR1; + break; + case SIGUSR2: + reload_flags = NM_CONFIG_CHANGE_CAUSE_SIGUSR2; + break; + default: + g_return_if_reached (); + } + nm_log_info (LOGD_CORE, "reload configuration (signal %s)...", strsignal (signal)); + /* The signal handler thread is only installed after * creating NMConfig instance, and on shut down we * no longer run the mainloop (to reach this point). * * Hence, a NMConfig singleton instance must always be * available. */ - nm_config_reload (nm_config_get (), signal); + nm_config_reload (nm_config_get (), reload_flags); } static void |