summaryrefslogtreecommitdiffstats
path: root/jobs/schedulers.go
diff options
context:
space:
mode:
Diffstat (limited to 'jobs/schedulers.go')
-rw-r--r--jobs/schedulers.go26
1 files changed, 13 insertions, 13 deletions
diff --git a/jobs/schedulers.go b/jobs/schedulers.go
index 839cbbae8..2823036df 100644
--- a/jobs/schedulers.go
+++ b/jobs/schedulers.go
@@ -4,11 +4,11 @@
package jobs
import (
+ "fmt"
"sync"
"time"
- l4g "github.com/alecthomas/log4go"
-
+ "github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
)
@@ -25,7 +25,7 @@ type Schedulers struct {
}
func (srv *JobServer) InitSchedulers() *Schedulers {
- l4g.Debug("Initialising schedulers.")
+ mlog.Debug("Initialising schedulers.")
schedulers := &Schedulers{
stop: make(chan bool),
@@ -59,10 +59,10 @@ func (schedulers *Schedulers) Start() *Schedulers {
go func() {
schedulers.startOnce.Do(func() {
- l4g.Info("Starting schedulers.")
+ mlog.Info("Starting schedulers.")
defer func() {
- l4g.Info("Schedulers stopped.")
+ mlog.Info("Schedulers stopped.")
close(schedulers.stopped)
}()
@@ -78,7 +78,7 @@ func (schedulers *Schedulers) Start() *Schedulers {
for {
select {
case <-schedulers.stop:
- l4g.Debug("Schedulers received stop signal.")
+ mlog.Debug("Schedulers received stop signal.")
return
case now = <-time.After(1 * time.Minute):
cfg := schedulers.jobs.Config()
@@ -93,8 +93,8 @@ func (schedulers *Schedulers) Start() *Schedulers {
if scheduler != nil {
if scheduler.Enabled(cfg) {
if _, err := schedulers.scheduleJob(cfg, scheduler); err != nil {
- l4g.Warn("Failed to schedule job with scheduler: %v", scheduler.Name())
- l4g.Error(err)
+ mlog.Warn(fmt.Sprintf("Failed to schedule job with scheduler: %v", scheduler.Name()))
+ mlog.Error(fmt.Sprint(err))
} else {
schedulers.setNextRunTime(cfg, idx, now, true)
}
@@ -119,7 +119,7 @@ func (schedulers *Schedulers) Start() *Schedulers {
}
func (schedulers *Schedulers) Stop() *Schedulers {
- l4g.Info("Stopping schedulers.")
+ mlog.Info("Stopping schedulers.")
close(schedulers.stop)
<-schedulers.stopped
return schedulers
@@ -130,7 +130,7 @@ func (schedulers *Schedulers) setNextRunTime(cfg *model.Config, idx int, now tim
if !pendingJobs {
if pj, err := schedulers.jobs.CheckForPendingJobsByType(scheduler.JobType()); err != nil {
- l4g.Error("Failed to set next job run time: " + err.Error())
+ mlog.Error("Failed to set next job run time: " + err.Error())
schedulers.nextRunTimes[idx] = nil
return
} else {
@@ -140,13 +140,13 @@ func (schedulers *Schedulers) setNextRunTime(cfg *model.Config, idx int, now tim
lastSuccessfulJob, err := schedulers.jobs.GetLastSuccessfulJobByType(scheduler.JobType())
if err != nil {
- l4g.Error("Failed to set next job run time: " + err.Error())
+ mlog.Error("Failed to set next job run time: " + err.Error())
schedulers.nextRunTimes[idx] = nil
return
}
schedulers.nextRunTimes[idx] = scheduler.NextScheduleTime(cfg, now, pendingJobs, lastSuccessfulJob)
- l4g.Debug("Next run time for scheduler %v: %v", scheduler.Name(), schedulers.nextRunTimes[idx])
+ mlog.Debug(fmt.Sprintf("Next run time for scheduler %v: %v", scheduler.Name(), schedulers.nextRunTimes[idx]))
}
func (schedulers *Schedulers) scheduleJob(cfg *model.Config, scheduler model.Scheduler) (*model.Job, *model.AppError) {
@@ -164,6 +164,6 @@ func (schedulers *Schedulers) scheduleJob(cfg *model.Config, scheduler model.Sch
}
func (schedulers *Schedulers) handleConfigChange(oldConfig *model.Config, newConfig *model.Config) {
- l4g.Debug("Schedulers received config change.")
+ mlog.Debug("Schedulers received config change.")
schedulers.configChanged <- newConfig
}