From e575661da99de81bf0f07d7efdcf8b4c5d9b779e Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Sat, 26 Oct 2024 17:38:06 +0200 Subject: [PATCH] core/service: use log_unit_* where appropriate (cherry picked from commit 1e8f0beee4272ddc8b25dfa9af8e54bafc4c061a) (cherry picked from commit b9ff85ece7a6bd9eca158aa0a8af46055ffb6142) Conflict:NA Reference:https://github.com/systemd/systemd/commit/e575661da99de81bf0f07d7efdcf8b4c5d9b779e --- src/core/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/service.c b/src/core/service.c index 5f4859e0d3..2894451d7f 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -4642,7 +4642,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; } @@ -4654,7 +4654,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; } @@ -4713,7 +4713,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"); } } -- 2.33.0