From 41ba5e9b70caa6d5580a2ad50ef9e4bffc5d70f2 Mon Sep 17 00:00:00 2001
From: Steve Azzopardi <steveazz@outlook.com>
Date: Wed, 23 Jan 2019 15:31:51 +0100
Subject: [PATCH] Update logging for processing multi runner
We are logging the same thing twice at a different level, change it so
that it is only logged once where we call `processRunner` at an error
level with the executor information.
---
commands/multi.go | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/commands/multi.go b/commands/multi.go
index 4f45f7cff..09c5c6be0 100644
--- a/commands/multi.go
+++ b/commands/multi.go
@@ -146,11 +146,6 @@ func (mr *RunCommand) processRunner(id int, runner *common.RunnerConfig, runners
executorData, releaseFn, err := mr.acquireRunnerResources(provider, runner)
if err != nil {
- mr.log().WithFields(logrus.Fields{
- "runner": runner.ShortDescription(),
- "executor": runner.Executor,
- }).WithError(err).
- Warn("Failed to acquire runner resource")
return
}
defer releaseFn()
@@ -262,7 +257,11 @@ func (mr *RunCommand) processRunners(id int, stopWorker chan bool, runners chan
case runner := <-runners:
err := mr.processRunner(id, runner, runners)
if err != nil {
- logrus.WithError(err).Error("Failed to process runner")
+ mr.log().WithFields(logrus.Fields{
+ "runner": runner.ShortDescription(),
+ "executor": runner.Executor,
+ }).WithError(err).
+ Error("Failed to process runner")
}
// force GC cycle after processing build
--
GitLab