summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-08-24 10:52:23 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-08-28 08:04:56 -0400
commit042f598892e2587d735e4de1f4aabcb3d89d05f1 (patch)
tree9e697bdb2d1c239e9c5c266cb8d2fb32a8d1b1f5 /src
parent335c46b59888d431e5a57cddcf7ceecd09ec8e4a (diff)
logind: be more verbose on errors
Diffstat (limited to 'src')
-rw-r--r--src/login/logind-session.c3
-rw-r--r--src/login/logind.c29
2 files changed, 25 insertions, 7 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 1fea4745b6..dac50e8334 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -480,7 +480,8 @@ static int session_start_scope(Session *s) {
r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-user-sessions.service", kill_mode, &error, &job);
if (r < 0) {
- log_error("Failed to start session scope: %s %s", bus_error(&error, r), error.name);
+ log_error("Failed to start session scope %s: %s %s",
+ scope, bus_error(&error, r), error.name);
dbus_error_free(&error);
free(scope);
diff --git a/src/login/logind.c b/src/login/logind.c
index 0002d262c1..9094567b8d 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1423,12 +1423,29 @@ int manager_startup(Manager *m) {
return r;
/* Deserialize state */
- manager_enumerate_devices(m);
- manager_enumerate_seats(m);
- manager_enumerate_users(m);
- manager_enumerate_sessions(m);
- manager_enumerate_inhibitors(m);
- manager_enumerate_buttons(m);
+ r = manager_enumerate_devices(m);
+ if (r < 0)
+ log_warning("Device enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_seats(m);
+ if (r < 0)
+ log_warning("Seat enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_users(m);
+ if (r < 0)
+ log_warning("User enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_sessions(m);
+ if (r < 0)
+ log_warning("Session enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_inhibitors(m);
+ if (r < 0)
+ log_warning("Inhibitor enumeration failed: %s", strerror(-r));
+
+ r = manager_enumerate_buttons(m);
+ if (r < 0)
+ log_warning("Button enumeration failed: %s", strerror(-r));
/* Remove stale objects before we start them */
manager_gc(m, false);