logind: don't misunderstand UnitRemoved signals during reloading

[elogind.git] / src / machine / machined-dbus.c

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 83a45b63baa0b54eaa379de909bf7d50848a0573..4664c73a9c88c849a6219dad1c912b836ba0d224 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -116,7 +116,7 @@ static bool valid_machine_name(const char *p) {
 
 static int bus_manager_create_machine(Manager *manager, DBusMessage *message) {
 
-        const char *name, *service, *class, *slice, *root_directory;
+        const char *name, *service, *class, *root_directory;
         _cleanup_free_ char *p = NULL;
         DBusMessageIter iter, sub;
         MachineClass c;
@@ -531,12 +531,12 @@ DBusHandlerResult bus_message_filter(
                         goto finish;
                 }
 
-
                 mm = hashmap_get(m->machine_units, unit);
                 if (mm) {
                         if (streq_ptr(path, mm->scope_job)) {
                                 free(mm->scope_job);
                                 mm->scope_job = NULL;
+                                machine_save(mm);
 
                                 if (mm->started) {
                                         if (streq(result, "done"))
@@ -569,6 +569,43 @@ DBusHandlerResult bus_message_filter(
                         if (mm)
                                 machine_add_to_gc_queue(mm);
                 }
+
+        } else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Manager", "UnitRemoved")) {
+                const char *path, *unit;
+                Machine *mm;
+
+                if (!dbus_message_get_args(message, &error,
+                                           DBUS_TYPE_STRING, &unit,
+                                           DBUS_TYPE_OBJECT_PATH, &path,
+                                           DBUS_TYPE_INVALID)) {
+                        log_error("Failed to parse UnitRemoved message: %s", bus_error_message(&error));
+                        goto finish;
+                }
+
+                mm = hashmap_get(m->machine_units, unit);
+                if (mm)
+                        machine_add_to_gc_queue(mm);
+
+        } else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Manager", "Reloading")) {
+                dbus_bool_t b;
+
+                if (!dbus_message_get_args(message, &error,
+                                           DBUS_TYPE_BOOLEAN, &b,
+                                           DBUS_TYPE_INVALID)) {
+                        log_error("Failed to parse Reloading message: %s", bus_error_message(&error));
+                        goto finish;
+                }
+
+                /* systemd finished reloading, let's recheck all our machines */
+                if (!b) {
+                        Machine *mm;
+                        Iterator i;
+
+                        log_debug("System manager has been reloaded, rechecking machines...");
+
+                        HASHMAP_FOREACH(mm, m->machines, i)
+                                machine_add_to_gc_queue(mm);
+                }
         }
 
 finish:
@@ -706,6 +743,16 @@ int manager_stop_unit(Manager *manager, const char *unit, DBusError *error, char
                         DBUS_TYPE_STRING, &fail,
                         DBUS_TYPE_INVALID);
         if (r < 0) {
+                if (dbus_error_has_name(error, BUS_ERROR_NO_SUCH_UNIT) ||
+                    dbus_error_has_name(error, BUS_ERROR_LOAD_FAILED)) {
+
+                        if (job)
+                                *job = NULL;
+
+                        dbus_error_free(error);
+                        return 0;
+                }
+
                 log_error("Failed to stop unit %s: %s", unit, bus_error(error, r));
                 return r;
         }
@@ -728,7 +775,7 @@ int manager_stop_unit(Manager *manager, const char *unit, DBusError *error, char
                 *job = copy;
         }
 
-        return 0;
+        return 1;
 }
 
 int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, DBusError *error) {
@@ -793,8 +840,19 @@ int manager_unit_is_active(Manager *manager, const char *unit) {
                         DBUS_TYPE_STRING, &interface,
                         DBUS_TYPE_STRING, &property,
                         DBUS_TYPE_INVALID);
-
         if (r < 0) {
+                if (dbus_error_has_name(&error, DBUS_ERROR_NO_REPLY) ||
+                    dbus_error_has_name(&error, DBUS_ERROR_DISCONNECTED)) {
+                        dbus_error_free(&error);
+                        return true;
+                }
+
+                if (dbus_error_has_name(&error, BUS_ERROR_NO_SUCH_UNIT) ||
+                    dbus_error_has_name(&error, BUS_ERROR_LOAD_FAILED)) {
+                        dbus_error_free(&error);
+                        return false;
+                }
+
                 log_error("Failed to query ActiveState: %s", bus_error(&error, r));
                 dbus_error_free(&error);
                 return r;