From bae05711b5d06f330423f69d4d6500c907b8d322 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Thu, 11 May 2023 13:05:39 +0800 Subject: loginctl: list-users: also show state --- src/login/loginctl.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/login/loginctl.c b/src/login/loginctl.c index a2d03a9e64..4559b83e50 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -206,13 +206,15 @@ static int list_users(int argc, char *argv[], void *userdata) { if (r < 0) return bus_log_parse_error(r); - table = table_new("uid", "user", "linger"); + table = table_new("uid", "user", "linger", "state"); if (!table) return log_oom(); (void) table_set_align_percent(table, TABLE_HEADER_CELL(0), 100); for (;;) { + _cleanup_(sd_bus_error_free) sd_bus_error error_property = SD_BUS_ERROR_NULL; + _cleanup_free_ char *state = NULL; const char *user, *object; uint32_t uid; int linger; @@ -228,16 +230,39 @@ static int list_users(int argc, char *argv[], void *userdata) { object, "org.freedesktop.login1.User", "Linger", - &error, + &error_property, 'b', &linger); - if (r < 0) - return log_error_errno(r, "Failed to get linger status: %s", bus_error_message(&error, r)); + if (r < 0) { + if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT)) + /* The user logged out when we're querying the property */ + continue; + + return log_error_errno(r, "Failed to get linger status for user %s: %s", + user, bus_error_message(&error_property, r)); + } + + r = sd_bus_get_property_string(bus, + "org.freedesktop.login1", + object, + "org.freedesktop.login1.User", + "State", + &error_property, + &state); + if (r < 0) { + if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT)) + /* The user logged out when we're querying the property */ + continue; + + return log_error_errno(r, "Failed to get state for user %s: %s", + user, bus_error_message(&error_property, r)); + } r = table_add_many(table, TABLE_UID, (uid_t) uid, TABLE_STRING, user, - TABLE_BOOLEAN, linger); + TABLE_BOOLEAN, linger, + TABLE_STRING, state); if (r < 0) return table_log_add_error(r); } -- cgit v1.2.1 From 486f61a8c908d63c47625c352e456d80c88b4687 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Thu, 11 May 2023 13:17:59 +0800 Subject: loginctl: list-sessions: minor modernization --- src/login/loginctl.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 4559b83e50..8f1a5a06de 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -142,9 +142,9 @@ static int list_sessions(int argc, char *argv[], void *userdata) { (void) table_set_align_percent(table, TABLE_HEADER_CELL(1), 100); for (;;) { - _cleanup_(sd_bus_error_free) sd_bus_error error_tty = SD_BUS_ERROR_NULL; - _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply_tty = NULL; - const char *id, *user, *seat, *object, *tty = NULL; + _cleanup_(sd_bus_error_free) sd_bus_error error_property = SD_BUS_ERROR_NULL; + _cleanup_free_ char *tty = NULL; + const char *id, *user, *seat, *object; uint32_t uid; r = sd_bus_message_read(reply, "(susso)", &id, &uid, &user, &seat, &object); @@ -153,21 +153,22 @@ static int list_sessions(int argc, char *argv[], void *userdata) { if (r == 0) break; - r = sd_bus_get_property( - bus, - "org.freedesktop.login1", - object, - "org.freedesktop.login1.Session", - "TTY", - &error_tty, - &reply_tty, - "s"); - if (r < 0) - log_warning_errno(r, "Failed to get TTY for session %s: %s", id, bus_error_message(&error_tty, r)); - else { - r = sd_bus_message_read(reply_tty, "s", &tty); - if (r < 0) - return bus_log_parse_error(r); + r = sd_bus_get_property_string(bus, + "org.freedesktop.login1", + object, + "org.freedesktop.login1.Session", + "TTY", + &error_property, + &tty); + if (r < 0) { + if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT)) + /* The session is already closed when we're querying the property */ + continue; + + log_warning_errno(r, "Failed to get TTY for session %s, ignoring: %s", + id, bus_error_message(&error_property, r)); + + sd_bus_error_free(&error_property); } r = table_add_many(table, -- cgit v1.2.1 From 8b6c039a1ac73da006bfe9d5735515bba12ef3c4 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Thu, 11 May 2023 13:21:37 +0800 Subject: loginctl: list-sessions: also show state --- src/login/loginctl.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 8f1a5a06de..dfc738c6d0 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -133,7 +133,7 @@ static int list_sessions(int argc, char *argv[], void *userdata) { if (r < 0) return bus_log_parse_error(r); - table = table_new("session", "uid", "user", "seat", "tty"); + table = table_new("session", "uid", "user", "seat", "tty", "state"); if (!table) return log_oom(); @@ -143,7 +143,7 @@ static int list_sessions(int argc, char *argv[], void *userdata) { for (;;) { _cleanup_(sd_bus_error_free) sd_bus_error error_property = SD_BUS_ERROR_NULL; - _cleanup_free_ char *tty = NULL; + _cleanup_free_ char *tty = NULL, *state = NULL; const char *id, *user, *seat, *object; uint32_t uid; @@ -171,12 +171,29 @@ static int list_sessions(int argc, char *argv[], void *userdata) { sd_bus_error_free(&error_property); } + r = sd_bus_get_property_string(bus, + "org.freedesktop.login1", + object, + "org.freedesktop.login1.Session", + "State", + &error_property, + &state); + if (r < 0) { + if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT)) + /* The session is already closed when we're querying the property */ + continue; + + return log_error_errno(r, "Failed to get state for session %s: %s", + id, bus_error_message(&error_property, r)); + } + r = table_add_many(table, TABLE_STRING, id, TABLE_UID, (uid_t) uid, TABLE_STRING, user, TABLE_STRING, seat, - TABLE_STRING, strna(tty)); + TABLE_STRING, strna(tty), + TABLE_STRING, state); if (r < 0) return table_log_add_error(r); } -- cgit v1.2.1