fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 08:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dispatcher: add cancellable for tracking SIGTERM

Browse source
This commit is contained in:
Thomas Haller 2021-08-03 09:59:04 +02:00
parent 4dd517ca61
commit 442428dbbf
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nm-dispatcher/nm-dispatcher.c
View file

@ -26,6 +26,7 @@ typedef struct Request Request;
static struct {
GDBusConnection *dbus_connection;
GCancellable * quit_cancellable;
gboolean debug;
gboolean persist;
GSource * quit_source;
@ -963,6 +964,7 @@ signal_handler(gpointer user_data)
_LOG_X_I("Caught signal %d, shutting down...", signo);
gl.shutdown_quitting = TRUE;
g_cancellable_cancel(gl.quit_cancellable);
return G_SOURCE_CONTINUE;
}
@ -1000,6 +1002,8 @@ main(int argc, char **argv)
source_term = nm_g_unix_signal_add_source(SIGTERM, signal_handler, GINT_TO_POINTER(SIGTERM));
source_int = nm_g_unix_signal_add_source(SIGINT, signal_handler, GINT_TO_POINTER(SIGINT));
gl.quit_cancellable = g_cancellable_new();
if (!parse_command_line(&argc, &argv, &error)) {
_LOG_X_W("Error parsing command line arguments: %s", error->message);
gl.exit_with_failure = TRUE;
@ -1094,5 +1098,7 @@ done:
nm_clear_g_source_inst(&source_term);
nm_clear_g_source_inst(&source_int);
g_clear_object(&gl.quit_cancellable);
return gl.exit_with_failure ? 1 : 0;
}