From 18bfd1ebc09adbf1c1c1d784b67fbc01e4fea1b4 Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Tue, 25 Sep 2018 10:47:45 -0700
Subject: [PATCH] fix logging

---
 nomad/worker.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/nomad/worker.go b/nomad/worker.go
index 0833a7f6eff1..886d1d2d729c 100644
--- a/nomad/worker.go
+++ b/nomad/worker.go
@@ -114,23 +114,21 @@ func (w *Worker) run() {
 
 		// Check for a shutdown
 		if w.srv.IsShutdown() {
-			w.logger.Error(fmt.Sprintf("nacking eval ID %v because the server shutdown", eval.ID))
+			w.logger.Error("nacking eval because the server is shutting down", "eval", log.Fmt("%#v", eval))
 			w.sendAck(eval.ID, token, false)
 			return
 		}
 
 		// Wait for the raft log to catchup to the evaluation
 		if err := w.waitForIndex(waitIndex, raftSyncLimit); err != nil {
-			wrappedErr := fmt.Sprintf("error waiting for raft index %v:%v", waitIndex, err)
-			w.logger.Error(wrappedErr)
+			w.logger.Error("error waiting for Raft index", "error", err, "index", waitIndex)
 			w.sendAck(eval.ID, token, false)
 			continue
 		}
 
 		// Invoke the scheduler to determine placements
 		if err := w.invokeScheduler(eval, token); err != nil {
-			wrappedErr := fmt.Sprintf("error invoking scheduler:%v", err)
-			w.logger.Error(wrappedErr)
+			w.logger.Error("error invoking scheduler", "error", err)
 			w.sendAck(eval.ID, token, false)
 			continue
 		}