From 5d64eb559358e5db26e86a102a2362ad896da331 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 19 Dec 2023 13:58:35 +0900 Subject: [PATCH] udev-spawn: slightly adjust logs about timed out commands - Add full stop to the messages. - Do not kill commands before logging "killing", but do after. --- src/udev/udev-spawn.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/udev/udev-spawn.c b/src/udev/udev-spawn.c index 67a30053251..9d6993a2429 100644 --- a/src/udev/udev-spawn.c +++ b/src/udev/udev-spawn.c @@ -105,19 +105,18 @@ static int on_spawn_timeout(sd_event_source *s, uint64_t usec, void *userdata) { DEVICE_TRACE_POINT(spawn_timeout, spawn->device, spawn->cmd); - kill_and_sigcont(spawn->pid, spawn->timeout_signal); - - log_device_error(spawn->device, "Spawned process '%s' ["PID_FMT"] timed out after %s, killing", + log_device_error(spawn->device, "Spawned process '%s' ["PID_FMT"] timed out after %s, killing.", spawn->cmd, spawn->pid, FORMAT_TIMESPAN(spawn->timeout_usec, USEC_PER_SEC)); + kill_and_sigcont(spawn->pid, spawn->timeout_signal); return 1; } static int on_spawn_timeout_warning(sd_event_source *s, uint64_t usec, void *userdata) { Spawn *spawn = ASSERT_PTR(userdata); - log_device_warning(spawn->device, "Spawned process '%s' ["PID_FMT"] is taking longer than %s to complete", + log_device_warning(spawn->device, "Spawned process '%s' ["PID_FMT"] is taking longer than %s to complete.", spawn->cmd, spawn->pid, FORMAT_TIMESPAN(spawn->timeout_warn_usec, USEC_PER_SEC)); -- 2.47.3