From ec803ada0a1c75d77839cafb4b0468fba50751d8 Mon Sep 17 00:00:00 2001 From: Nikhil Ranjan Date: Mon, 9 Sep 2019 18:53:33 +0200 Subject: [PATCH] Converting to structured logging the file jobs/schedulers.go (#12122) * Converting to structured logging the file jobs/schedulers.go * merge mlog warn and error in single error --- jobs/schedulers.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/jobs/schedulers.go b/jobs/schedulers.go index b0cb92fc5a..706e5d7ef4 100644 --- a/jobs/schedulers.go +++ b/jobs/schedulers.go @@ -4,7 +4,6 @@ package jobs import ( - "fmt" "sync" "time" @@ -103,8 +102,7 @@ func (schedulers *Schedulers) Start() *Schedulers { if scheduler != nil { if scheduler.Enabled(cfg) { if _, err := schedulers.scheduleJob(cfg, scheduler); err != nil { - mlog.Warn(fmt.Sprintf("Failed to schedule job with scheduler: %v", scheduler.Name())) - mlog.Error(fmt.Sprint(err)) + mlog.Error("Failed to schedule job", mlog.String("scheduler", scheduler.Name()), mlog.Err(err)) } else { schedulers.setNextRunTime(cfg, idx, now, true) } @@ -148,7 +146,7 @@ func (schedulers *Schedulers) setNextRunTime(cfg *model.Config, idx int, now tim if !pendingJobs { if pj, err := schedulers.jobs.CheckForPendingJobsByType(scheduler.JobType()); err != nil { - mlog.Error("Failed to set next job run time: " + err.Error()) + mlog.Error("Failed to set next job run time", mlog.Err(err)) schedulers.nextRunTimes[idx] = nil return } else { @@ -158,13 +156,13 @@ func (schedulers *Schedulers) setNextRunTime(cfg *model.Config, idx int, now tim lastSuccessfulJob, err := schedulers.jobs.GetLastSuccessfulJobByType(scheduler.JobType()) if err != nil { - mlog.Error("Failed to set next job run time: " + err.Error()) + mlog.Error("Failed to set next job run time", mlog.Err(err)) schedulers.nextRunTimes[idx] = nil return } schedulers.nextRunTimes[idx] = scheduler.NextScheduleTime(cfg, now, pendingJobs, lastSuccessfulJob) - mlog.Debug(fmt.Sprintf("Next run time for scheduler %v: %v", scheduler.Name(), schedulers.nextRunTimes[idx])) + mlog.Debug("Next run time for scheduler", mlog.String("scheduler_name", scheduler.Name()), mlog.String("next_runtime", schedulers.nextRunTimes[idx].String())) } func (schedulers *Schedulers) scheduleJob(cfg *model.Config, scheduler model.Scheduler) (*model.Job, *model.AppError) {