chiark / gitweb /
systemctl: clearer error message for missing install information
[elogind.git] / src / systemctl / systemctl.c
index 952be1d11f931f3aac29dda4ce4c0025dc80307c..133a27c67e35adb2503ce0aee5d4b2bf46f23459 100644 (file)
@@ -1500,27 +1500,27 @@ finish:
         return r;
 }
 
-static int get_unit_path(
-                DBusConnection *bus,
-                DBusError *error,
-                const char *name,
-                char **unit_path) {
-
+static int check_one_unit(DBusConnection *bus, char *name, bool quiet) {
         DBusMessage *m = NULL, *reply = NULL;
-        int r = 0;
+        DBusError error;
+        DBusMessageIter iter, sub;
+        const char
+                *interface = "org.freedesktop.systemd1.Unit",
+                *property = "ActiveState";
+        const char *path = NULL;
+        const char *state;
+        int r = 3; /* According to LSB: "program is not running" */
 
         assert(bus);
-        assert(error);
         assert(name);
-        assert(unit_path);
-
-        *unit_path = NULL;
 
+        dbus_error_init(&error);
 
-        m = dbus_message_new_method_call("org.freedesktop.systemd1",
-                                         "/org/freedesktop/systemd1",
-                                         "org.freedesktop.systemd1.Manager",
-                                         "GetUnit");
+        m = dbus_message_new_method_call(
+                              "org.freedesktop.systemd1",
+                              "/org/freedesktop/systemd1",
+                              "org.freedesktop.systemd1.Manager",
+                              "GetUnit");
         if (!m) {
                 log_error("Could not allocate message.");
                 r = -ENOMEM;
@@ -1528,70 +1528,36 @@ static int get_unit_path(
         }
 
         if (!dbus_message_append_args(m,
-                                DBUS_TYPE_STRING, &name,
-                                DBUS_TYPE_INVALID)) {
+                                      DBUS_TYPE_STRING, &name,
+                                      DBUS_TYPE_INVALID)) {
                 log_error("Could not append arguments to message.");
                 r = -ENOMEM;
                 goto finish;
         }
 
-        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error);
+        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
         if (!reply) {
-                if (streq(error->name, BUS_ERROR_NO_SUCH_UNIT)) {
-                        dbus_error_free(error);
-                        r = -EINVAL;
-                } else {
-                        log_error("Failed to issue method call: %s", bus_error_message(error));
-                        r = -EIO;
-                }
+                /* Hmm, cannot figure out anything about this unit... */
+                if (!quiet)
+                        puts("unknown");
+
                 goto finish;
         }
 
-        if (!dbus_message_get_args(reply, error,
-                                DBUS_TYPE_OBJECT_PATH, unit_path,
-                                DBUS_TYPE_INVALID)) {
-                log_error("Failed to parse reply: %s", bus_error_message(error));
+        if (!dbus_message_get_args(reply, &error,
+                                   DBUS_TYPE_OBJECT_PATH, &path,
+                                   DBUS_TYPE_INVALID)) {
+                log_error("Failed to parse reply: %s", bus_error_message(&error));
                 r = -EIO;
                 goto finish;
         }
 
-        *unit_path = strdup(*unit_path);
-        if (!(*unit_path)) {
-               log_error("Failed to duplicate unit path");
-               r = -ENOMEM;
-        }
-finish:
-        if (m)
-                dbus_message_unref(m);
-        if (reply)
-                dbus_message_unref(reply);
-        return r;
-}
-
-static int is_socket_listening(
-                DBusConnection *bus,
-                DBusError *error,
-                const char *socket_name) {
-
-        DBusMessage *m = NULL, *reply = NULL;
-        DBusMessageIter iter, sub;
-        char *socket_object_path = NULL;
-        const char *sub_state = NULL,
-                   *interface = "org.freedesktop.systemd1.Unit",
-                   *property = "SubState";
-        int r = 0;
-
-        assert(bus);
-        assert(error);
-        assert(socket_name);
-
-        if ((r = get_unit_path(bus, error, socket_name, &socket_object_path)) < 0) {
-                goto finish;
-        }
-        m = dbus_message_new_method_call("org.freedesktop.systemd1",
-                                         socket_object_path,
-                                         "org.freedesktop.DBus.Properties",
-                                         "Get");
+        dbus_message_unref(m);
+        m = dbus_message_new_method_call(
+                              "org.freedesktop.systemd1",
+                              path,
+                              "org.freedesktop.DBus.Properties",
+                              "Get");
         if (!m) {
                 log_error("Could not allocate message.");
                 r = -ENOMEM;
@@ -1599,31 +1565,45 @@ static int is_socket_listening(
         }
 
         if (!dbus_message_append_args(m,
-                                DBUS_TYPE_STRING, &interface,
-                                DBUS_TYPE_STRING, &property,
-                                DBUS_TYPE_INVALID)) {
+                                      DBUS_TYPE_STRING, &interface,
+                                      DBUS_TYPE_STRING, &property,
+                                      DBUS_TYPE_INVALID)) {
                 log_error("Could not append arguments to message.");
                 r = -ENOMEM;
                 goto finish;
         }
 
-        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error);
+        dbus_message_unref(reply);
+        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
         if (!reply) {
-                log_error("Failed to issue method call: %s", bus_error_message(error));
+                log_error("Failed to issue method call: %s", bus_error_message(&error));
+                r = -EIO;
+                goto finish;
+        }
+
+        if (!dbus_message_iter_init(reply, &iter) ||
+            dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)  {
+                log_error("Failed to parse reply.");
                 r = -EIO;
                 goto finish;
         }
 
-        dbus_message_iter_init(reply, &iter);
         dbus_message_iter_recurse(&iter, &sub);
 
-        if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING) {
-                log_error("Failed to parse reply: %s", bus_error_message(error));
+        if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING)  {
+                log_error("Failed to parse reply.");
                 r = -EIO;
                 goto finish;
         }
-        dbus_message_iter_get_basic(&sub, &sub_state);
-        r = streq(sub_state, "listening");
+
+        dbus_message_iter_get_basic(&sub, &state);
+
+        if (!quiet)
+                puts(state);
+
+        if (streq(state, "active") || streq(state, "reloading"))
+                r = 0;
+
 finish:
         if (m)
                 dbus_message_unref(m);
@@ -1631,25 +1611,30 @@ finish:
         if (reply)
                 dbus_message_unref(reply);
 
-        free(socket_object_path);
+        dbus_error_free(&error);
+
         return r;
 }
 
-static void check_listening_sockets(
+static void check_triggering_units(
                 DBusConnection *bus,
-                DBusError *error,
                 const char *unit_name) {
 
+        DBusError error;
         DBusMessage *m = NULL, *reply = NULL;
         DBusMessageIter iter, sub;
-        const char *service_trigger = NULL,
-                   *interface = "org.freedesktop.systemd1.Unit",
+        char *service_trigger = NULL;
+        const char *interface = "org.freedesktop.systemd1.Unit",
                    *triggered_by_property = "TriggeredBy";
 
         char *unit_path = NULL;
-        int print_warning_label = 1;
+        bool print_warning_label = true;
+
+        dbus_error_init(&error);
 
-        if ((get_unit_path(bus, error, unit_name, &unit_path) < 0)) {
+        unit_path = unit_dbus_path_from_name(unit_name);
+        if (!unit_path) {
+                log_error("Could not allocate dbus path.");
                 goto finish;
         }
 
@@ -1663,22 +1648,22 @@ static void check_listening_sockets(
         }
 
         if (!dbus_message_append_args(m,
-                                DBUS_TYPE_STRING, &interface,
-                                DBUS_TYPE_STRING, &triggered_by_property,
-                                DBUS_TYPE_INVALID)) {
+                                      DBUS_TYPE_STRING, &interface,
+                                      DBUS_TYPE_STRING, &triggered_by_property,
+                                      DBUS_TYPE_INVALID)) {
                 log_error("Could not append arguments to message.");
                 goto finish;
         }
 
-        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error);
+        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
         if (!reply) {
-                log_error("Failed to issue method call: %s", bus_error_message(error));
+                log_error("Failed to issue method call: %s", bus_error_message(&error));
                 goto finish;
         }
 
         if (!dbus_message_iter_init(reply, &iter) ||
-                        dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
-                log_error("Failed to parse reply: %s", bus_error_message(error));
+            dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
+                log_error("Failed to parse reply: %s", bus_error_message(&error));
                 goto finish;
 
         }
@@ -1688,35 +1673,27 @@ static void check_listening_sockets(
         sub = iter;
 
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
-                int r = 0;
+                int r;
 
                 if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING) {
-                        log_error("Failed to parse reply: %s", bus_error_message(error));
+                        log_error("Failed to parse reply: %s", bus_error_message(&error));
                         goto finish;
                 }
 
                 dbus_message_iter_get_basic(&sub, &service_trigger);
 
-                if (endswith(service_trigger, ".socket")) {
-                        r = is_socket_listening(bus, error, service_trigger);
-                } else {
-                        dbus_message_iter_recurse(&iter, &sub);
-                        iter = sub;
-                        continue;
-                }
-
-                if (r == 1) {
+                r = check_one_unit(bus, service_trigger, true);
+                if (r < 0)
+                        goto finish;
+                if (r == 0) {
                         if (print_warning_label) {
-                                log_warning("There are listening sockets associated with %s :", unit_name);
-                                print_warning_label = 0;
+                                log_warning("Warning: Stopping %s, but it can still be activated by:", unit_name);
+                                print_warning_label = false;
                         }
-                        log_warning("%s",service_trigger);
-                } else if (r < 0) {
-                        log_error("Failed to issue function call: %s", bus_error_message(error));
-                        goto finish;
+                        log_warning("  %s", service_trigger);
                 }
-                dbus_message_iter_recurse(&iter, &sub);
-                iter = sub;
+
+                dbus_message_iter_next(&sub);
         }
 finish:
         if (m)
@@ -1725,6 +1702,8 @@ finish:
         if (reply)
                 dbus_message_unref(reply);
 
+        dbus_error_free(&error);
+
         free(unit_path);
 }
 
@@ -1808,10 +1787,10 @@ static int start_unit_one(
                 }
         }
 
-        /* When stopping unit check if we have some listening sockets active */
-        if (streq(method, "StopUnit") && !arg_quiet) {
-               check_listening_sockets(bus, error, name);
-        }
+        /* When stopping a unit warn if it can still be triggered by
+         * another active unit (socket, path, timer) */
+        if (!arg_quiet && streq(method, "StopUnit"))
+                check_triggering_units(bus, name);
 
         r = 0;
 
@@ -2098,126 +2077,20 @@ static int start_special(DBusConnection *bus, char **args) {
 }
 
 static int check_unit(DBusConnection *bus, char **args) {
-        DBusMessage *m = NULL, *reply = NULL;
-        const char
-                *interface = "org.freedesktop.systemd1.Unit",
-                *property = "ActiveState";
-        int r = 3; /* According to LSB: "program is not running" */
-        DBusError error;
         char **name;
+        int r = 3; /* According to LSB: "program is not running" */
 
         assert(bus);
         assert(args);
 
-        dbus_error_init(&error);
-
         STRV_FOREACH(name, args+1) {
-                const char *path = NULL;
-                const char *state;
-                DBusMessageIter iter, sub;
-
-                if (!(m = dbus_message_new_method_call(
-                                      "org.freedesktop.systemd1",
-                                      "/org/freedesktop/systemd1",
-                                      "org.freedesktop.systemd1.Manager",
-                                      "GetUnit"))) {
-                        log_error("Could not allocate message.");
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_STRING, name,
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to message.");
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
-
-                        /* Hmm, cannot figure out anything about this unit... */
-                        if (!arg_quiet)
-                                puts("unknown");
-
-                        dbus_error_free(&error);
-                        dbus_message_unref(m);
-                        m = NULL;
-                        continue;
-                }
-
-                if (!dbus_message_get_args(reply, &error,
-                                           DBUS_TYPE_OBJECT_PATH, &path,
-                                           DBUS_TYPE_INVALID)) {
-                        log_error("Failed to parse reply: %s", bus_error_message(&error));
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_unref(m);
-                if (!(m = dbus_message_new_method_call(
-                                      "org.freedesktop.systemd1",
-                                      path,
-                                      "org.freedesktop.DBus.Properties",
-                                      "Get"))) {
-                        log_error("Could not allocate message.");
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_STRING, &interface,
-                                              DBUS_TYPE_STRING, &property,
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to message.");
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                dbus_message_unref(reply);
-                if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
-                        log_error("Failed to issue method call: %s", bus_error_message(&error));
-                        r = -EIO;
-                        goto finish;
-                }
-
-                if (!dbus_message_iter_init(reply, &iter) ||
-                    dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)  {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_iter_recurse(&iter, &sub);
-
-                if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING)  {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_iter_get_basic(&sub, &state);
-
-                if (!arg_quiet)
-                        puts(state);
-
-                if (streq(state, "active") || streq(state, "reloading"))
+                int state = check_one_unit(bus, *name, arg_quiet);
+                if (state < 0)
+                        return state;
+                if (state == 0)
                         r = 0;
-
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
         }
 
-finish:
-        if (m)
-                dbus_message_unref(m);
-
-        if (reply)
-                dbus_message_unref(reply);
-
-        dbus_error_free(&error);
-
         return r;
 }
 
@@ -3367,12 +3240,7 @@ static int show(DBusConnection *bus, char **args) {
 
                         /* Interpret as unit name */
 
-                        char *e, *p;
-                        e = bus_path_escape(*name);
-                        if (!e)
-                                return -ENOMEM;
-                        p = strappend("/org/freedesktop/systemd1/unit/", e);
-                        free(e);
+                        char *p = unit_dbus_path_from_name(*name);
                         if (!p)
                                 return -ENOMEM;
 
@@ -4341,7 +4209,7 @@ static int enable_unit(DBusConnection *bus, char **args) {
         }
 
         if (carries_install_info == 0)
-                log_warning("Warning: unit files do not carry install information. No operation executed.");
+                log_warning("The unit files have no [Install] section. They are not meant to be enabled using systemctl.");
 
 finish:
         if (m)