diff options
| -rw-r--r-- | src/login/logind-dbus.c | 2 | ||||
| -rw-r--r-- | src/login/logind-session.c | 21 |
2 files changed, 6 insertions, 17 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index bf1e7ee8e..c5ac94360 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -837,6 +837,8 @@ static int method_release_session(sd_bus *bus, sd_bus_message *message, void *us if (r < 0) return r; + session_add_to_gc_queue(session); + return sd_bus_reply_method_return(message, NULL); } diff --git a/src/login/logind-session.c b/src/login/logind-session.c index c7c88f863..9d731b9a3 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -40,8 +40,6 @@ #include "formats-util.h" #include "terminal-util.h" -#define RELEASE_USEC (20*USEC_PER_SEC) - static void session_remove_fifo(Session *s); Session* session_new(Manager *m, const char *id) { @@ -607,16 +605,6 @@ int session_finalize(Session *s) { return r; } -static int release_timeout_callback(sd_event_source *es, uint64_t usec, void *userdata) { - Session *s = userdata; - - assert(es); - assert(s); - - session_stop(s, false); - return 0; -} - int session_release(Session *s) { assert(s); @@ -626,11 +614,10 @@ int session_release(Session *s) { if (s->timer_event_source) return 0; - return sd_event_add_time(s->manager->event, - &s->timer_event_source, - CLOCK_MONOTONIC, - now(CLOCK_MONOTONIC) + RELEASE_USEC, 0, - release_timeout_callback, s); + /* In systemd, session release is triggered by user jobs + dying. In elogind we don't have that so go ahead and stop + now. */ + session_stop(s, false); } bool session_is_active(Session *s) { |