From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 26 Oct 2024 15:38:06 +0000 (+0200)
Subject: core/service: use log_unit_* where appropriate
X-Git-Tag: v256.8~67
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=b9ff85ece7a6bd9eca158aa0a8af46055ffb6142;p=systemd%2F.git

core/service: use log_unit_* where appropriate

(cherry picked from commit 1e8f0beee4272ddc8b25dfa9af8e54bafc4c061a)
---

diff --git a/src/core/service.c b/src/core/service.c
index 6e81460ad0..549847e3f9 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -4656,7 +4656,7 @@ static int bus_name_pid_lookup_callback(sd_bus_message *reply, void *userdata, s
         e = sd_bus_message_get_error(reply);
         if (e) {
                 r = sd_bus_error_get_errno(e);
-                log_warning_errno(r, "GetConnectionUnixProcessID() failed: %s", bus_error_message(e, r));
+                log_unit_warning_errno(UNIT(s), r, "GetConnectionUnixProcessID() failed: %s", bus_error_message(e, r));
                 return 1;
         }
 
@@ -4668,7 +4668,7 @@ static int bus_name_pid_lookup_callback(sd_bus_message *reply, void *userdata, s
 
         r = pidref_set_pid(&pidref, pid);
         if (r < 0) {
-                log_debug_errno(r, "GetConnectionUnixProcessID() returned invalid PID: %m");
+                log_unit_debug_errno(UNIT(s), r, "GetConnectionUnixProcessID() returned invalid PID: %m");
                 return 1;
         }
 
@@ -4724,7 +4724,7 @@ static void service_bus_name_owner_change(Unit *u, const char *new_owner) {
                                 "s",
                                 s->bus_name);
                 if (r < 0)
-                        log_debug_errno(r, "Failed to request owner PID of service name, ignoring: %m");
+                        log_unit_debug_errno(u, r, "Failed to request owner PID of service name, ignoring: %m");
         }
 }