summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-05 13:31:25 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-05 13:50:35 +0200
commitb27adf354a83ad25f4a209c0a6f7989ecab7b4e2 (patch)
treec0febe33f0fa5861948fdd0af7f35188bf3f0d89 /src
parenteec6022cf039e62233139000b9e95db943959e48 (diff)
bus: make use of sd_bus_try_close() in exit-on-idle services
Diffstat (limited to 'src')
-rw-r--r--src/libsystemd/sd-bus/bus-util.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
index 6bd21ccb37..6441c5b162 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -43,7 +43,9 @@ static int name_owner_change_callback(sd_bus *bus, sd_bus_message *m, void *user
assert(m);
assert(e);
+ sd_bus_close(bus);
sd_event_exit(e, 0);
+
return 1;
}
@@ -121,11 +123,30 @@ int bus_event_loop_with_idle(
return r;
if (r == 0 && !exiting) {
- r = bus_async_unregister_and_exit(e, bus, name);
+
+ r = sd_bus_try_close(bus);
+ if (r == -EBUSY)
+ continue;
+
+ if (r == -ENOTSUP) {
+ /* Fallback for dbus1 connections: we
+ * unregister the name and wait for
+ * the response to come through for
+ * it */
+
+ r = bus_async_unregister_and_exit(e, bus, name);
+ if (r < 0)
+ return r;
+
+ exiting = true;
+ continue;
+ }
+
if (r < 0)
return r;
- exiting = true;
+ sd_event_exit(e, 0);
+ break;
}
}