yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-06-15 14:12:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(worker): rename provider.setLogFile to provider.prepareLogFile

Browse Source
This commit is contained in:
bigeagle 2016-04-28 15:05:13 +08:00
parent 9afd47ddcb
commit 6062aa4b9d
No known key found for this signature in database
GPG Key ID: 9171A4571C27920A
5 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worker/cmd_provider.go
View File

@ -62,7 +62,7 @@ func (p *cmdProvider) Start() error {
env[k] = v env[k] = v
} }
p.cmd = newCmdJob(p.command, p.WorkingDir(), env) p.cmd = newCmdJob(p.command, p.WorkingDir(), env)
if err := p.setLogFile(); err != nil { if err := p.prepareLogFile(); err != nil {
return err return err
} }

15
worker/config.go
View File

@ -15,21 +15,6 @@ const (
ProvCommand 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 { func (p *ProviderEnum) UnmarshalText(text []byte) error {
s := string(text) s := string(text)
switch s { switch s {

2
worker/provider.go
View File

@ -122,7 +122,7 @@ func (p *baseProvider) Hooks() []jobHook {
return p.hooks return p.hooks
} }
func (p *baseProvider) setLogFile() error { func (p *baseProvider) prepareLogFile() error {
if p.LogFile() == "/dev/null" { if p.LogFile() == "/dev/null" {
p.cmd.SetLogFile(nil) p.cmd.SetLogFile(nil)
return nil return nil

2
worker/rsync_provider.go
View File

@ -81,7 +81,7 @@ func (p *rsyncProvider) Start() error {
command = append(command, p.upstreamURL, p.WorkingDir()) command = append(command, p.upstreamURL, p.WorkingDir())
p.cmd = newCmdJob(command, p.WorkingDir(), env) p.cmd = newCmdJob(command, p.WorkingDir(), env)
if err := p.setLogFile(); err != nil { if err := p.prepareLogFile(); err != nil {
return err return err
} }

2
worker/two_stage_rsync_provider.go
View File

@ -117,7 +117,7 @@ func (p *twoStageRsyncProvider) Run() error {
command = append(command, p.upstreamURL, p.WorkingDir()) command = append(command, p.upstreamURL, p.WorkingDir())
p.cmd = newCmdJob(command, p.WorkingDir(), env) p.cmd = newCmdJob(command, p.WorkingDir(), env)
if err := p.setLogFile(); err != nil { if err := p.prepareLogFile(); err != nil {
return err return err
} }