From dd269abeb5ccc0aad7eeeaa63f754dbe81f1de78 Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Sat, 6 Aug 2016 23:37:32 +0900
Subject: [PATCH] Update GetArtifact by removing unused logger

---
 client/getter/getter.go      |  5 +----
 client/getter/getter_test.go | 13 ++++---------
 client/task_runner.go        |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/client/getter/getter.go b/client/getter/getter.go
index 83ee0d695..c534964a8 100644
--- a/client/getter/getter.go
+++ b/client/getter/getter.go
@@ -2,7 +2,6 @@ package getter
 
 import (
 	"fmt"
-	"log"
 	"net/url"
 	"path/filepath"
 	"sync"
@@ -63,9 +62,7 @@ func getGetterUrl(taskEnv *env.TaskEnvironment, artifact *structs.TaskArtifact)
 }
 
 // GetArtifact downloads an artifact into the specified task directory.
-func GetArtifact(taskEnv *env.TaskEnvironment, artifact *structs.TaskArtifact,
-	taskDir string, logger *log.Logger) error {
-
+func GetArtifact(taskEnv *env.TaskEnvironment, artifact *structs.TaskArtifact, taskDir string) error {
 	url, err := getGetterUrl(taskEnv, artifact)
 	if err != nil {
 		return err
diff --git a/client/getter/getter_test.go b/client/getter/getter_test.go
index 463c2fe7a..4fb4bdb97 100644
--- a/client/getter/getter_test.go
+++ b/client/getter/getter_test.go
@@ -3,7 +3,6 @@ package getter
 import (
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -40,8 +39,7 @@ func TestGetArtifact_FileAndChecksum(t *testing.T) {
 
 	// Download the artifact
 	taskEnv := env.NewTaskEnvironment(mock.Node())
-	logger := log.New(os.Stderr, "", log.LstdFlags)
-	if err := GetArtifact(taskEnv, artifact, taskDir, logger); err != nil {
+	if err := GetArtifact(taskEnv, artifact, taskDir); err != nil {
 		t.Fatalf("GetArtifact failed: %v", err)
 	}
 
@@ -76,8 +74,7 @@ func TestGetArtifact_File_RelativeDest(t *testing.T) {
 
 	// Download the artifact
 	taskEnv := env.NewTaskEnvironment(mock.Node())
-	logger := log.New(os.Stderr, "", log.LstdFlags)
-	if err := GetArtifact(taskEnv, artifact, taskDir, logger); err != nil {
+	if err := GetArtifact(taskEnv, artifact, taskDir); err != nil {
 		t.Fatalf("GetArtifact failed: %v", err)
 	}
 
@@ -128,8 +125,7 @@ func TestGetArtifact_InvalidChecksum(t *testing.T) {
 
 	// Download the artifact and expect an error
 	taskEnv := env.NewTaskEnvironment(mock.Node())
-	logger := log.New(os.Stderr, "", log.LstdFlags)
-	if err := GetArtifact(taskEnv, artifact, taskDir, logger); err == nil {
+	if err := GetArtifact(taskEnv, artifact, taskDir); err == nil {
 		t.Fatalf("GetArtifact should have failed")
 	}
 }
@@ -195,8 +191,7 @@ func TestGetArtifact_Archive(t *testing.T) {
 	}
 
 	taskEnv := env.NewTaskEnvironment(mock.Node())
-	logger := log.New(os.Stderr, "", log.LstdFlags)
-	if err := GetArtifact(taskEnv, artifact, taskDir, logger); err != nil {
+	if err := GetArtifact(taskEnv, artifact, taskDir); err != nil {
 		t.Fatalf("GetArtifact failed: %v", err)
 	}
 
diff --git a/client/task_runner.go b/client/task_runner.go
index 67edbbc8a..b40ac3c51 100644
--- a/client/task_runner.go
+++ b/client/task_runner.go
@@ -323,7 +323,7 @@ func (r *TaskRunner) run() {
 			}
 
 			for _, artifact := range r.task.Artifacts {
-				if err := getter.GetArtifact(r.taskEnv, artifact, taskDir, r.logger); err != nil {
+				if err := getter.GetArtifact(r.taskEnv, artifact, taskDir); err != nil {
 					r.setState(structs.TaskStateDead,
 						structs.NewTaskEvent(structs.TaskArtifactDownloadFailed).SetDownloadError(err))
 					r.restartTracker.SetStartError(dstructs.NewRecoverableError(err, true))