diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-11-27 02:38:06 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-11-27 02:39:19 +0100 |
| commit | 85a428c69465b047731b6abb5005f01824f1444e (patch) | |
| tree | 0e893b3555f1afd9ae3b8b5af1de9259c5581e12 /src/login/logind-dbus.c | |
| parent | fbb634117d0b0ebd5b105e65b141e75ae9af7f8f (diff) | |
logind: log which process is delaying suspend and not closing locks
Diffstat (limited to 'src/login/logind-dbus.c')
| -rw-r--r-- | src/login/logind-dbus.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index a972d93774..e0333cd6b0 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1399,7 +1399,7 @@ int bus_manager_shutdown_or_sleep_now_or_later( delayed = m->inhibit_delay_max > 0 && - manager_is_inhibited(m, w, INHIBIT_DELAY, NULL, false, false, 0); + manager_is_inhibited(m, w, INHIBIT_DELAY, NULL, false, false, 0, NULL); if (delayed) /* Shutdown is delayed, keep in mind what we @@ -1465,7 +1465,7 @@ static int method_do_shutdown_or_sleep( return r; multiple_sessions = r > 0; - blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid); + blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL); if (multiple_sessions) { r = bus_verify_polkit_async(m->bus, &m->polkit_registry, message, @@ -1610,7 +1610,7 @@ static int method_can_shutdown_or_sleep( return r; multiple_sessions = r > 0; - blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid); + blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL); if (multiple_sessions) { r = bus_verify_polkit(m->bus, message, action_multiple_sessions, false, &challenge, error); @@ -2105,6 +2105,7 @@ int manager_send_changed(Manager *manager, const char *property, ...) { int manager_dispatch_delayed(Manager *manager) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + Inhibitor *offending = NULL; int r; assert(manager); @@ -2113,12 +2114,18 @@ int manager_dispatch_delayed(Manager *manager) { return 0; /* Continue delay? */ - if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0)) { + if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0, &offending)) { + _cleanup_free_ char *comm = NULL, *u = NULL; + + get_process_comm(offending->pid, &comm); + u = uid_to_name(offending->uid); if (manager->action_timestamp + manager->inhibit_delay_max > now(CLOCK_MONOTONIC)) return 0; - log_info("Delay lock is active but inhibitor timeout is reached."); + log_info("Delay lock is active (UID %lu/%s, PID %lu/%s) but inhibitor timeout is reached.", + (unsigned long) offending->uid, strna(u), + (unsigned long) offending->pid, strna(comm)); } /* Actually do the operation */ |