yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-06-16 07:02:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(worker): log file link should use relative path

Browse Source
This commit is contained in:
bigeagle 2016-05-02 13:38:25 +08:00
parent 583eaf7f6a
commit fecfc8f3b1
No known key found for this signature in database
GPG Key ID: 9171A4571C27920A
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
worker/loglimit_hook.go
View File

@ -68,13 +68,13 @@ func (l *logLimiter) preExec() error {
} }
} }
logFile := filepath.Join( logFileName := fmt.Sprintf(
logDir,
fmt.Sprintf(
"%s_%s.log", "%s_%s.log",
p.Name(), p.Name(),
time.Now().Format("2006-01-02_15_04"), time.Now().Format("2006-01-02_15_04"),
), )
logFilePath := filepath.Join(
logDir, logFileName,
) )
logLink := filepath.Join(logDir, "latest") logLink := filepath.Join(logDir, "latest")
@ -82,10 +82,10 @@ func (l *logLimiter) preExec() error {
if _, err = os.Stat(logLink); err == nil { if _, err = os.Stat(logLink); err == nil {
os.Remove(logLink) os.Remove(logLink)
} }
os.Symlink(logFile, logLink) os.Symlink(logFileName, logLink)
ctx := p.EnterContext() ctx := p.EnterContext()
ctx.Set(_LogFileKey, logFile) ctx.Set(_LogFileKey, logFilePath)
return nil return nil
} }
@ -101,7 +101,8 @@ func (l *logLimiter) postFail() error {
logLink := filepath.Join(logDir, "latest") logLink := filepath.Join(logDir, "latest")
os.Rename(logFile, logFileFail) os.Rename(logFile, logFileFail)
os.Remove(logLink) os.Remove(logLink)
os.Symlink(logFileFail, logLink) logFileName := filepath.Base(logFileFail)
os.Symlink(logFileName, logLink)
l.provider.ExitContext() l.provider.ExitContext()
return nil return nil