cgroup: if the system bus cannot be found, send cgroup empty msg directly to init...

[elogind.git] / src / dbus.c

diff --git a/src/dbus.c b/src/dbus.c
index 0b93db55deda86d54b93815f8ed7ccd90c35d821..0ab55b85395c44808b996024a63f98db8e15cdd6 100644 (file)
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -474,11 +474,14 @@ static DBusHandlerResult system_bus_message_filter(DBusConnection *connection, D
 
 static DBusHandlerResult private_bus_message_filter(DBusConnection *connection, DBusMessage *message, void *data) {
         Manager *m = data;
 
 static DBusHandlerResult private_bus_message_filter(DBusConnection *connection, DBusMessage *message, void *data) {
         Manager *m = data;

+        DBusError error;

 
         assert(connection);
         assert(message);
         assert(m);
 
 
         assert(connection);
         assert(message);
         assert(m);
 

+        dbus_error_init(&error);
+

         if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL ||
             dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL)
                 log_debug("Got D-Bus request: %s.%s() on %s",
         if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL ||
             dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL)
                 log_debug("Got D-Bus request: %s.%s() on %s",


@@ -488,6 +491,18 @@ static DBusHandlerResult private_bus_message_filter(DBusConnection *connection,
 
         if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected"))
                 shutdown_connection(m, connection);
 
         if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected"))
                 shutdown_connection(m, connection);

+        else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Agent", "Released")) {
+                const char *cgroup;
+
+                if (!dbus_message_get_args(message, &error,
+                                           DBUS_TYPE_STRING, &cgroup,
+                                           DBUS_TYPE_INVALID))
+                        log_error("Failed to parse Released message: %s", error.message);
+                else
+                        cgroup_notify_empty(m, cgroup);
+        }
+
+        dbus_error_free(&error);

 
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }