yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-04-20 11:42:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

closing log files where they were opened

Browse Source
This commit is contained in:
z4yx 2020-03-28 15:15:51 +08:00
parent d10387e40b
commit 1fb9f85862
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worker/base_provider.go
View File

@ -19,6 +19,7 @@ type baseProvider struct {
isMaster bool
cmd *cmdJob
logFileFd *os.File
isRunning atomic.Value
cgroup *cgroupHook
@ -128,10 +129,19 @@ func (p *baseProvider) prepareLogFile(append bool) error {
logger.Errorf("Error opening logfile %s: %s", p.LogFile(), err.Error())
return err
}
p.logFileFd = logFile
p.cmd.SetLogFile(logFile)
return nil
}
func (p *baseProvider) closeLogFile() (err error) {
if p.logFileFd != nil {
err = p.logFileFd.Close()
p.logFileFd = nil
}
return
}
func (p *baseProvider) Run() error {
panic("Not Implemented")
}

1
worker/cmd_provider.go
View File

@ -88,6 +88,7 @@ func (p *cmdProvider) DataSize() string {
func (p *cmdProvider) Run() error {
p.dataSize = ""
defer p.closeLogFile()
if err := p.Start(); err != nil {
return err
}

1
worker/rsync_provider.go
View File

@ -105,6 +105,7 @@ func (p *rsyncProvider) DataSize() string {
func (p *rsyncProvider) Run() error {
p.dataSize = ""
defer p.closeLogFile()
if err := p.Start(); err != nil {
return err
}

3
worker/runner.go
View File

@ -118,9 +118,6 @@ func (c *cmdJob) Wait() error {
return c.retErr
default:
err := c.cmd.Wait()
if c.cmd.Stdout != nil {
c.cmd.Stdout.(*os.File).Close()
}
c.retErr = err
close(c.finished)
return err

1
worker/two_stage_rsync_provider.go
View File

@ -156,6 +156,7 @@ func (p *twoStageRsyncProvider) Run() error {
if err := p.prepareLogFile(stage > 1); err != nil {
return err
}
defer p.closeLogFile()
if err = p.cmd.Start(); err != nil {
return err