From 59c05eb64be92acf7b1621c828fa19f578b2ee78 Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Sun, 7 Aug 2016 13:03:57 +0900
Subject: [PATCH] tiny: Return fmt.Errorf instead of duplicated error messages

---
 client/alloc_runner.go |  2 +-
 client/client.go       |  8 +++-----
 client/task_runner.go  | 21 ++++++---------------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/client/alloc_runner.go b/client/alloc_runner.go
index 3f338c8c4..f8aa61699 100644
--- a/client/alloc_runner.go
+++ b/client/alloc_runner.go
@@ -204,7 +204,7 @@ func (r *AllocRunner) saveAllocRunnerState() error {
 func (r *AllocRunner) saveTaskRunnerState(tr *TaskRunner) error {
 	var err error
 	if err = tr.SaveState(); err != nil {
-		r.logger.Printf("[ERR] client: failed to save state for alloc %s task '%s': %v",
+		return fmt.Errorf("client: failed to save state for alloc %s task '%s': %v",
 			r.alloc.ID, tr.task.Name, err)
 	}
 	return err
diff --git a/client/client.go b/client/client.go
index a8fe2be78..bf33def46 100644
--- a/client/client.go
+++ b/client/client.go
@@ -344,8 +344,7 @@ func (c *Client) RPC(method string, args interface{}, reply interface{}) error {
 	// Make the RPC request
 	if err := c.connPool.RPC(c.Region(), server.Addr, c.RPCMajorVersion(), method, args, reply); err != nil {
 		c.rpcProxy.NotifyFailedServer(server)
-		c.logger.Printf("[ERR] client: RPC failed to server %s: %v", server.Addr, err)
-		return err
+		return fmt.Errorf("client: RPC failed to server %s: %v", server.Addr, err)
 	}
 	return nil
 }
@@ -837,7 +836,7 @@ func (c *Client) registerNode() error {
 	err := c.RPC("Node.Register", &req, &resp)
 	if err != nil {
 		if time.Since(c.start) > registerErrGrace {
-			c.logger.Printf("[ERR] client: failed to register node: %v", err)
+			return fmt.Errorf("client: failed to register node: %v", err)
 		}
 		return err
 	}
@@ -870,8 +869,7 @@ func (c *Client) updateNodeStatus() error {
 	var resp structs.NodeUpdateResponse
 	err := c.RPC("Node.UpdateStatus", &req, &resp)
 	if err != nil {
-		c.logger.Printf("[ERR] client: failed to update status: %v", err)
-		return err
+		return fmt.Errorf("client: failed to update status: %v", err)
 	}
 	if len(resp.EvalIDs) != 0 {
 		c.logger.Printf("[DEBUG] client: %d evaluations triggered by node update", len(resp.EvalIDs))
diff --git a/client/task_runner.go b/client/task_runner.go
index 3055a2916..47b216683 100644
--- a/client/task_runner.go
+++ b/client/task_runner.go
@@ -147,19 +147,15 @@ func (r *TaskRunner) RestoreState() error {
 
 	// Restore fields
 	if snap.Task == nil {
-		err := fmt.Errorf("task runner snapshot include nil Task")
-		r.logger.Printf("[ERR] client: %v", err)
-		return err
+		return fmt.Errorf("client: task runner snapshot include nil Task")
 	} else {
 		r.task = snap.Task
 	}
 	r.artifactsDownloaded = snap.ArtifactDownloaded
 
 	if err := r.setTaskEnv(); err != nil {
-		err := fmt.Errorf("failed to create task environment for task %q in allocation %q: %v",
+		return fmt.Errorf("client: failed to create task environment for task %q in allocation %q: %v",
 			r.task.Name, r.alloc.ID, err)
-		r.logger.Printf("[ERR] client: %s", err)
-		return err
 	}
 
 	// Restore the driver
@@ -233,17 +229,14 @@ func (r *TaskRunner) setTaskEnv() error {
 // createDriver makes a driver for the task
 func (r *TaskRunner) createDriver() (driver.Driver, error) {
 	if r.taskEnv == nil {
-		err := fmt.Errorf("task environment not made for task %q in allocation %q", r.task.Name, r.alloc.ID)
-		return nil, err
+		return nil, fmt.Errorf("task environment not made for task %q in allocation %q", r.task.Name, r.alloc.ID)
 	}
 
 	driverCtx := driver.NewDriverContext(r.task.Name, r.config, r.config.Node, r.logger, r.taskEnv)
 	driver, err := driver.NewDriver(r.task.Driver, driverCtx)
 	if err != nil {
-		err = fmt.Errorf("failed to create driver '%s' for alloc %s: %v",
+		return nil, fmt.Errorf("client: failed to create driver '%s' for alloc %s: %v",
 			r.task.Driver, r.alloc.ID, err)
-		r.logger.Printf("[ERR] client: %s", err)
-		return nil, err
 	}
 	return driver, err
 }
@@ -471,17 +464,15 @@ func (r *TaskRunner) startTask() error {
 	// Create a driver
 	driver, err := r.createDriver()
 	if err != nil {
-		r.logger.Printf("[ERR] client: failed to create driver of task '%s' for alloc '%s': %v",
+		return fmt.Errorf("client: failed to create driver of task '%s' for alloc '%s': %v",
 			r.task.Name, r.alloc.ID, err)
-		return err
 	}
 
 	// Start the job
 	handle, err := driver.Start(r.ctx, r.task)
 	if err != nil {
-		r.logger.Printf("[ERR] client: failed to start task '%s' for alloc '%s': %v",
+		return fmt.Errorf("client: failed to start task '%s' for alloc '%s': %v",
 			r.task.Name, r.alloc.ID, err)
-		return err
 	}
 
 	r.handleLock.Lock()