diff options
Diffstat (limited to 'session-helper/flatpak-session-helper.c')
| -rw-r--r-- | session-helper/flatpak-session-helper.c | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c index c753da28..40cb7bdc 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c @@ -1,4 +1,4 @@ -/* +/* vi:set et sw=2 sts=2 cin cino=t0,f0,(0,{s,>2s,n-s,^-s,e-s: * Copyright © 2014-2019 Red Hat, Inc * * This program is free software; you can redistribute it and/or @@ -49,8 +49,11 @@ do_atexit (void) static void handle_sigterm (int signum) { + struct sigaction action = { 0 }; do_atexit (); - _exit (1); + action.sa_handler = SIG_DFL; + sigaction (signum, &action, NULL); + raise (signum); } typedef struct @@ -98,7 +101,7 @@ child_watch_died (GPid pid, PidData *pid_data = user_data; g_autoptr(GVariant) signal_variant = NULL; - g_debug ("Client Pid %d died", pid_data->pid); + g_info ("Client Pid %d died", pid_data->pid); signal_variant = g_variant_ref_sink (g_variant_new ("(uu)", pid, status)); g_dbus_connection_emit_signal (session_bus, @@ -185,8 +188,8 @@ child_setup_func (gpointer user_data) if (fd_map[i].from == data->tty) { if (ioctl (fd_map[i].final, TIOCSCTTY, 0) == -1) - g_debug ("ioctl(%d, TIOCSCTTY, 0) failed: %s", - fd_map[i].final, strerror (errno)); + g_info ("ioctl(%d, TIOCSCTTY, 0) failed: %s", + fd_map[i].final, strerror (errno)); break; } } @@ -236,7 +239,7 @@ handle_host_command (FlatpakDevelopment *object, return G_DBUS_METHOD_INVOCATION_HANDLED; } - g_debug ("Running host command %s", arg_argv[0]); + g_info ("Running host command %s", arg_argv[0]); n_fds = 0; fds = NULL; @@ -351,7 +354,7 @@ handle_host_command (FlatpakDevelopment *object, pid_data, NULL); - g_debug ("Client Pid is %d", pid_data->pid); + g_info ("Client Pid is %d", pid_data->pid); g_hash_table_replace (client_pid_data_hash, GUINT_TO_POINTER (pid_data->pid), pid_data); @@ -381,7 +384,7 @@ handle_host_command_signal (FlatpakDevelopment *object, return G_DBUS_METHOD_INVOCATION_HANDLED; } - g_debug ("Sending signal %d to client pid %d", arg_signal, arg_pid); + g_info ("Sending signal %d to client pid %d", arg_signal, arg_pid); if (to_process_group) killpg (pid_data->pid, arg_signal); @@ -563,8 +566,8 @@ update_real_monitor (MonitorData *data) if (real == NULL) { - g_debug ("unable to get real path to monitor host file %s: %s", data->source, - g_strerror (errno)); + g_info ("unable to get real path to monitor host file %s: %s", data->source, + g_strerror (errno)); return; } @@ -603,7 +606,7 @@ update_real_monitor (MonitorData *data) data->monitor_real = g_file_monitor_file (r, G_FILE_MONITOR_NONE, NULL, &err); if (!data->monitor_real) { - g_debug ("failed to monitor host file %s (real path of %s): %s", + g_info ("failed to monitor host file %s (real path of %s): %s", real, data->source, err->message); return; } @@ -662,7 +665,7 @@ setup_file_monitor (const char *source) } else { - g_debug ("failed to monitor host file %s: %s", source, err->message); + g_info ("failed to monitor host file %s: %s", source, err->message); } file_monitor_do (data); @@ -677,7 +680,7 @@ message_handler (const gchar *log_domain, gpointer user_data) { /* Make this look like normal console output */ - if (log_level & G_LOG_LEVEL_DEBUG) + if (log_level & (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO)) g_printerr ("F: %s\n", message); else g_printerr ("%s: %s\n", g_get_prgname (), message); @@ -706,7 +709,7 @@ start_p11_kit_server (const char *flatpak_dir) NULL }; - g_debug ("starting p11-kit server"); + g_info ("starting p11-kit server"); if (!g_spawn_sync (NULL, p11_argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, @@ -747,11 +750,11 @@ start_p11_kit_server (const char *flatpak_dir) if (p11_kit_server_pid != 0) { - g_debug ("Using p11-kit socket path %s, pid %d", socket_path, p11_kit_server_pid); + g_info ("Using p11-kit socket path %s, pid %d", socket_path, p11_kit_server_pid); p11_kit_server_socket_path = g_steal_pointer (&socket_path); } else - g_debug ("Not using p11-kit due to older version"); + g_info ("Not using p11-kit due to older version"); } int @@ -823,7 +826,7 @@ main (int argc, } if (verbose) - g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL); + g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, message_handler, NULL); client_pid_data_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) pid_data_free); @@ -844,7 +847,7 @@ main (int argc, if (g_find_program_in_path ("p11-kit")) start_p11_kit_server (flatpak_dir); else - g_debug ("p11-kit not found"); + g_info ("p11-kit not found"); monitor_dir = g_build_filename (flatpak_dir, "monitor", NULL); if (g_mkdir_with_parents (monitor_dir, 0755) != 0) |