From 7a7a07d9adcc65539fe3b55b15016dcc7d25dae9 Mon Sep 17 00:00:00 2001 From: James Read Date: Fri, 9 Aug 2024 15:53:02 +0100 Subject: [PATCH] feature: Minor change to action timeout message to be more consistent with other logs (#380) --- internal/executor/executor.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/executor/executor.go b/internal/executor/executor.go index 7aeed52..a3151a5 100644 --- a/internal/executor/executor.go +++ b/internal/executor/executor.go @@ -326,7 +326,7 @@ func stepLogStart(req *ExecutionRequest) bool { log.WithFields(log.Fields{ "actionTitle": req.logEntry.ActionTitle, "timeout": req.Action.Timeout, - }).Infof("Action starting") + }).Infof("Action started") return true } @@ -416,7 +416,10 @@ func stepExec(req *ExecutionRequest) bool { appendErrorToStderr(waiterr, req.logEntry) if ctx.Err() == context.DeadlineExceeded { - log.Warnf("Command timed out: %v", req.finalParsedCommand) + log.WithFields(log.Fields{ + "actionTitle": req.logEntry.ActionTitle, + }).Warnf("Action timed out") + // The context timeout should kill the process, but let's make sure. req.executor.Kill(req.logEntry) req.logEntry.TimedOut = true