From 652e714d500cff50bca8bacc121d7e2b9de81b6a Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Mon, 8 Mar 2021 10:27:29 -0800 Subject: [PATCH] Merge pull request #10135 from hashicorp/b-fix-log client: fix task name logging --- CHANGELOG.md | 3 ++- client/allocrunner/alloc_runner.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72f0624bc19..8c66c29ef4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ BUG FIXES: * api: Added missing devices block to AllocatedTaskResources [[GH-10064](https://github.com/hashicorp/nomad/pull/10064)] * cli: Fixed a bug where non-int proxy port would panic CLI [[GH-10072](https://github.com/hashicorp/nomad/issues/10072)] * cli: Fixed a bug where `nomad operator debug` incorrectly parsed https Consul API URLs. [[GH-10082](https://github.com/hashicorp/nomad/pull/10082)] - * ui: Fixed the rendering of interstitial components shown after processing a dynamic application sizing recommendation. [[GH-10094](https://github.com/hashicorp/nomad/pull/10094)] + * client: Fixed log formatting when killing tasks. [[GH-10135](https://github.com/hashicorp/nomad/issues/10135)] + * ui: Fixed the rendering of interstitial components shown after processing a dynamic application sizing recommendation. [[GH-10094](https://github.com/hashicorp/nomad/pull/10094)] ## 1.0.4 (February 24, 2021) diff --git a/client/allocrunner/alloc_runner.go b/client/allocrunner/alloc_runner.go index 279f5f9e48a..e9782b8f2b8 100644 --- a/client/allocrunner/alloc_runner.go +++ b/client/allocrunner/alloc_runner.go @@ -553,7 +553,7 @@ func (ar *allocRunner) handleTaskStateUpdates() { // prevent looping before TaskRunners have transitioned // to Dead. for _, tr := range liveRunners { - ar.logger.Info("killing task: ", tr.Task().Name) + ar.logger.Info("killing task", "task", tr.Task().Name) select { case <-tr.WaitCh(): case <-ar.waitCh: