Skip to content

Exit jackdbus cleanly on SIGTERM #1024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iibaranov-IG wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Exit jackdbus cleanly on SIGTERM #1024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions dbus/jackdbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,28 @@ char *g_jackdbus_log_dir;
size_t g_jackdbus_log_dir_len; /* without terminating '\0' char */
int g_exit_command;
DBusConnection *g_connection;
static volatile sig_atomic_t g_exit_signal;

static void
jack_dbus_exit_signal_handler(int signal)
{
g_exit_signal = signal;
}

static bool
jack_dbus_setup_signals(void)
{
struct sigaction action;

memset(&action, 0, sizeof(action));
sigemptyset(&action.sa_mask);
action.sa_handler = jack_dbus_exit_signal_handler;

return sigaction(SIGHUP, &action, NULL) == 0 &&
sigaction(SIGINT, &action, NULL) == 0 &&
sigaction(SIGQUIT, &action, NULL) == 0 &&
sigaction(SIGTERM, &action, NULL) == 0;
}

void
jack_dbus_send_signal(
Expand Down Expand Up @@ -889,7 +911,12 @@ main (int argc, char **argv)
}

#if !defined(DISABLE_SIGNAL_MAGIC)
jackctl_setup_signals(0);
g_exit_signal = 0;
if (!jack_dbus_setup_signals())
{
ret = 1;
goto fail_uninit_log;
}
#endif

jack_set_error_function(jack_dbus_error_callback);
Expand Down Expand Up @@ -947,11 +974,16 @@ main (int argc, char **argv)
jack_info("Listening for D-Bus messages");

g_exit_command = FALSE;
while (!g_exit_command && dbus_connection_read_write_dispatch (g_connection, 200))
while (!g_exit_command && !g_exit_signal && dbus_connection_read_write_dispatch (g_connection, 200))
{
jack_controller_run(controller_ptr);
}

if (g_exit_signal)
{
jack_info("Controller received signal %d.", g_exit_signal);
}

jack_controller_destroy(controller_ptr);

jack_info("Controller deactivated.");
Expand Down