nxshock/gron
1
0
Fork 0
mirror of https://github.com/nxshock/gron.git synced 2024-11-27 03:41:00 +05:00
Code Issues Projects Releases Wiki Activity

Move job log file creation to separate func

Browse Source
This commit is contained in:
nxshock 2022-03-29 21:52:45 +05:00
parent 0099dec0ff
commit 7828951733
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
job.go
View File

@ -70,8 +70,10 @@ func (j *Job) commandAndParams() (command string, params []string) {
return items[0], items[1:] return items[0], items[1:]
} }
func (j *Job) Run() { // logEntry - logger which merged with main logger,
jobLogFile, _ := os.OpenFile(filepath.Join(config.LogFilesPath, j.Name+".log"), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644) // jobLogFile - job log file with needs to be closed after job is done
func (j *Job) openAndMergeLog() (logEntry *log.Entry, jobLogFile *os.File) {
jobLogFile, _ = os.OpenFile(filepath.Join(config.LogFilesPath, j.Name+".log"), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644) // TODO: handle error
jobLogFile.WriteString("\n") jobLogFile.WriteString("\n")
logWriter := io.MultiWriter(logFile, jobLogFile) logWriter := io.MultiWriter(logFile, jobLogFile)
@ -83,10 +85,17 @@ func (j *Job) Run() {
NoColors: true, NoColors: true,
TrimMessages: true}) TrimMessages: true})
log.SetOutput(logWriter) log.SetOutput(logWriter)
logEntry := log.WithField("job", j.Name) logEntry = log.WithField("job", j.Name)
return logEntry, jobLogFile
}
func (j *Job) Run() {
log, jobLogFile := j.openAndMergeLog()
defer jobLogFile.Close()
for i := 0; i < j.JobConfig.NumberOfRestartAttemts+1; i++ { for i := 0; i < j.JobConfig.NumberOfRestartAttemts+1; i++ {
logEntry.Info("Started.") log.Info("Started.")
startTime := time.Now() startTime := time.Now()
globalMutex.Lock() globalMutex.Lock()
@ -94,7 +103,6 @@ func (j *Job) Run() {
j.LastStartTime = startTime.Format(config.TimeFormat) j.LastStartTime = startTime.Format(config.TimeFormat)
globalMutex.Unlock() globalMutex.Unlock()
/**/
command, params := j.commandAndParams() command, params := j.commandAndParams()
cmd := exec.Command(command, params...) cmd := exec.Command(command, params...)
@ -103,7 +111,7 @@ func (j *Job) Run() {
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
logEntry.Error(err.Error()) log.Error(err.Error())
globalMutex.Lock() globalMutex.Lock()
j.LastError = err.Error() j.LastError = err.Error()
@ -115,7 +123,7 @@ func (j *Job) Run() {
} }
endTime := time.Now() endTime := time.Now()
logEntry.Infof("Finished (%s).", endTime.Sub(startTime).Truncate(time.Second).String()) log.Infof("Finished (%s).", endTime.Sub(startTime).Truncate(time.Second).String())
globalMutex.Lock() globalMutex.Lock()
j.CurrentRunningCount-- j.CurrentRunningCount--
@ -132,15 +140,13 @@ func (j *Job) Run() {
} }
if i == 0 { if i == 0 {
logEntry.Printf("Job failed, restarting in %d seconds.", j.JobConfig.RestartSec) log.Printf("Job failed, restarting in %d seconds.", j.JobConfig.RestartSec)
} else if i+1 < j.JobConfig.NumberOfRestartAttemts { } else if i+1 < j.JobConfig.NumberOfRestartAttemts {
logEntry.Printf("Retry attempt №%d of %d failed, restarting in %d seconds.", i, j.JobConfig.NumberOfRestartAttemts, j.JobConfig.RestartSec) log.Printf("Retry attempt №%d of %d failed, restarting in %d seconds.", i, j.JobConfig.NumberOfRestartAttemts, j.JobConfig.RestartSec)
} else { } else {
logEntry.Printf("Retry attempt №%d of %d failed.", i, j.JobConfig.NumberOfRestartAttemts) log.Printf("Retry attempt №%d of %d failed.", i, j.JobConfig.NumberOfRestartAttemts)
} }
time.Sleep(time.Duration(j.JobConfig.RestartSec) * time.Second) time.Sleep(time.Duration(j.JobConfig.RestartSec) * time.Second)
} }
jobLogFile.Close()
} }