From 6062aa4b9d33ca0aeee6dc3b66f13c433601fd17 Mon Sep 17 00:00:00 2001
From: bigeagle <justin.w.xd@gmail.com>
Date: Thu, 28 Apr 2016 15:05:13 +0800
Subject: [PATCH] refactor(worker): rename provider.setLogFile to
 provider.prepareLogFile

---
 worker/cmd_provider.go             |  2 +-
 worker/config.go                   | 15 ---------------
 worker/provider.go                 |  2 +-
 worker/rsync_provider.go           |  2 +-
 worker/two_stage_rsync_provider.go |  2 +-
 5 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/worker/cmd_provider.go b/worker/cmd_provider.go
index d6df6e7..38cdcac 100644
--- a/worker/cmd_provider.go
+++ b/worker/cmd_provider.go
@@ -62,7 +62,7 @@ func (p *cmdProvider) Start() error {
 		env[k] = v
 	}
 	p.cmd = newCmdJob(p.command, p.WorkingDir(), env)
-	if err := p.setLogFile(); err != nil {
+	if err := p.prepareLogFile(); err != nil {
 		return err
 	}
 
diff --git a/worker/config.go b/worker/config.go
index 9c96aa1..f766ee1 100644
--- a/worker/config.go
+++ b/worker/config.go
@@ -15,21 +15,6 @@ const (
 	ProvCommand
 )
 
-func (p ProviderEnum) MarshalText() ([]byte, error) {
-
-	switch p {
-	case ProvCommand:
-		return []byte("command"), nil
-	case ProvRsync:
-		return []byte("rsync"), nil
-	case ProvTwoStageRsync:
-		return []byte("two-stage-rsync"), nil
-	default:
-		return []byte{}, errors.New("Invalid ProviderEnum value")
-	}
-
-}
-
 func (p *ProviderEnum) UnmarshalText(text []byte) error {
 	s := string(text)
 	switch s {
diff --git a/worker/provider.go b/worker/provider.go
index 7cd8b85..6aba4dc 100644
--- a/worker/provider.go
+++ b/worker/provider.go
@@ -122,7 +122,7 @@ func (p *baseProvider) Hooks() []jobHook {
 	return p.hooks
 }
 
-func (p *baseProvider) setLogFile() error {
+func (p *baseProvider) prepareLogFile() error {
 	if p.LogFile() == "/dev/null" {
 		p.cmd.SetLogFile(nil)
 		return nil
diff --git a/worker/rsync_provider.go b/worker/rsync_provider.go
index 34d8ddb..96e88c7 100644
--- a/worker/rsync_provider.go
+++ b/worker/rsync_provider.go
@@ -81,7 +81,7 @@ func (p *rsyncProvider) Start() error {
 	command = append(command, p.upstreamURL, p.WorkingDir())
 
 	p.cmd = newCmdJob(command, p.WorkingDir(), env)
-	if err := p.setLogFile(); err != nil {
+	if err := p.prepareLogFile(); err != nil {
 		return err
 	}
 
diff --git a/worker/two_stage_rsync_provider.go b/worker/two_stage_rsync_provider.go
index d5d7380..247aa0e 100644
--- a/worker/two_stage_rsync_provider.go
+++ b/worker/two_stage_rsync_provider.go
@@ -117,7 +117,7 @@ func (p *twoStageRsyncProvider) Run() error {
 		command = append(command, p.upstreamURL, p.WorkingDir())
 
 		p.cmd = newCmdJob(command, p.WorkingDir(), env)
-		if err := p.setLogFile(); err != nil {
+		if err := p.prepareLogFile(); err != nil {
 			return err
 		}