X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fanalyze%2Fanalyze-verify.c;h=f56910926808ae5cd79c0ecb78388a91d321e5a6;hb=d69a7ceaed77992105342a056fe68769c2e6d3bd;hp=5b16b6c3d975ac45ecc4d3fe900690c51c087092;hpb=1d3bc0177a1952473bbe45b5bbb4e4e4f69a84f4;p=elogind.git

diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c
index 5b16b6c3d..f56910926 100644
--- a/src/analyze/analyze-verify.c
+++ b/src/analyze/analyze-verify.c
@@ -74,7 +74,7 @@ static int verify_socket(Unit *u) {
         /* This makes sure instance is created if necessary. */
         r = socket_instantiate_service(SOCKET(u));
         if (r < 0) {
-                log_error_unit(u->id, "Socket %s cannot be started, failed to create instance.",
+                log_unit_error(u->id, "Socket %s cannot be started, failed to create instance.",
                                u->id);
                 return r;
         }
@@ -84,10 +84,10 @@ static int verify_socket(Unit *u) {
                 Service *service;
 
                 service = SERVICE(UNIT_DEREF(SOCKET(u)->service));
-                log_debug_unit(u->id, "%s uses %s", u->id, UNIT(service)->id);
+                log_unit_debug(u->id, "%s uses %s", u->id, UNIT(service)->id);
 
                 if (UNIT(service)->load_state != UNIT_LOADED) {
-                        log_error_unit(u->id, "Service %s not loaded, %s cannot be started.",
+                        log_unit_error(u->id, "Service %s not loaded, %s cannot be started.",
                                        UNIT(service)->id, u->id);
                         return -ENOENT;
                 }
@@ -101,7 +101,7 @@ static int verify_executable(Unit *u, ExecCommand *exec) {
                 return 0;
 
         if (access(exec->path, X_OK) < 0) {
-                log_error_unit(u->id, "%s: command %s is not executable: %m",
+                log_unit_error(u->id, "%s: command %s is not executable: %m",
                                u->id, exec->path);
                 return -errno;
         }
@@ -145,15 +145,15 @@ static int verify_documentation(Unit *u, bool check_man) {
         int r = 0, k;
 
         STRV_FOREACH(p, u->documentation) {
-                log_debug_unit(u->id, "%s: found documentation item %s.", u->id, *p);
+                log_unit_debug(u->id, "%s: found documentation item %s.", u->id, *p);
                 if (check_man && startswith(*p, "man:")) {
                         k = show_man_page(*p + 4, true);
                         if (k != 0) {
                                 if (k < 0)
-                                        log_error_unit(u->id, "%s: can't show %s: %s",
+                                        log_unit_error(u->id, "%s: can't show %s: %s",
                                                        u->id, *p, strerror(-r));
                                 else {
-                                        log_error_unit(u->id, "%s: man %s command failed with code %d",
+                                        log_unit_error(u->id, "%s: man %s command failed with code %d",
                                                        u->id, *p + 4, k);
                                         k = -ENOEXEC;
                                 }
@@ -178,13 +178,13 @@ static int verify_unit(Unit *u, bool check_man) {
         if (log_get_max_level() >= LOG_DEBUG)
                 unit_dump(u, stdout, "\t");
 
-        log_debug_unit(u->id, "Creating %s/start job", u->id);
+        log_unit_debug(u->id, "Creating %s/start job", u->id);
         r = manager_add_job(u->manager, JOB_START, u, JOB_REPLACE, false, &err, &j);
         if (sd_bus_error_is_set(&err))
-                log_error_unit(u->id, "Error: %s: %s",
+                log_unit_error(u->id, "Error: %s: %s",
                                err.name, err.message);
         if (r < 0)
-                log_error_unit(u->id, "Failed to create %s/start: %s",
+                log_unit_error(u->id, "Failed to create %s/start: %s",
                                u->id, strerror(-r));
 
         k = verify_socket(u);
@@ -221,24 +221,20 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
 
         /* set the path */
         r = generate_path(&var, filenames);
-        if (r < 0) {
-                log_error("Failed to generate unit load path: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to generate unit load path: %m");
 
         assert_se(set_unit_path(var) >= 0);
 
         r = manager_new(running_as, true, &m);
-        if (r < 0) {
-                log_error("Failed to initalize manager: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to initalize manager: %m");
 
         log_debug("Starting manager...");
 
         r = manager_startup(m, serial, fdset);
         if (r < 0) {
-                log_error("Failed to start manager: %s", strerror(-r));
+                log_error_errno(r, "Failed to start manager: %m");
                 goto finish;
         }
 
@@ -260,7 +256,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
                 } else
                         k = manager_load_unit(m, NULL, *filename, &err, &units[count]);
                 if (k < 0) {
-                        log_error("Failed to load %s: %s", *filename, strerror(-k));
+                        log_error_errno(k, "Failed to load %s: %m", *filename);
                         if (r == 0)
                                 r = k;
                 } else