Skip to content
Permalink
Browse files

manager: restart user bus if last graphical session

There are desktop services (such as goa-daemon, e-d-s, etc)
that don't open the display, but rely on dbus-daemon to scope
the session. These days dbus-daemon is a user bus, not a sesssion,
bus which leaves these services alive after log out.

This commit checks to see if we're the last desktop session for the
user at log out time, and if so, restarts the dbus daemon. This
will lead to existing clients getting booted and die, but allow user
bus clients that want to outlive a session to stick around if they so
desire.

Longer term, clients should stop relying on the session bus to define
their lifetime.

https://bugzilla.gnome.org/show_bug.cgi?id=764029
Adapted from https://gitlab.gnome.org/GNOME/gnome-session/commit/97d1cf5
  • Loading branch information...
vkareh committed Jan 29, 2019
1 parent 37d538e commit 9c748b1c4f72d003d187337f6c4b71a7a56a2f22
Showing with 49 additions and 0 deletions.
  1. +49 −0 mate-session/gsm-manager.c
@@ -889,6 +889,51 @@ _client_stop (const char *id,
return FALSE;
}

#ifdef HAVE_SYSTEMD
static void
maybe_restart_user_bus (GsmManager *manager)
{
GsmSystemd *systemd;
GsmManagerPrivate *priv;
GDBusConnection *connection;

g_autoptr(GVariant) reply = NULL;
g_autoptr(GError) error = NULL;

priv = gsm_manager_get_instance_private (manager);
if (priv->dbus_disconnected)
return;

systemd = gsm_get_systemd ();

if (!gsm_systemd_is_last_session_for_user (systemd))
return;

connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);

if (error != NULL) {
g_debug ("GsmManager: failed to connect to session bus: %s", error->message);
return;
}

reply = g_dbus_connection_call_sync (connection,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
"TryRestartUnit",
g_variant_new ("(ss)", "dbus.service", "replace"),
NULL,
G_DBUS_CALL_FLAGS_NONE,
-1,
NULL,
&error);

if (error != NULL) {
g_debug ("GsmManager: reloading user bus failed: %s", error->message);
}
}
#endif

static void
do_phase_exit (GsmManager *manager)
{
@@ -901,6 +946,10 @@ do_phase_exit (GsmManager *manager)
NULL);
}

#ifdef HAVE_SYSTEMD
maybe_restart_user_bus (manager);
#endif

end_phase (manager);
}

0 comments on commit 9c748b1

Please sign in to comment.
You can’t perform that action at this time.