[MM-20723] Add golint for plugin package to golangci (#13090)

This commit is contained in:
Ben Schumacher
2019-12-05 20:31:53 +01:00
committed by GitHub
parent d12bf77f53
commit 5122b9e292
12 changed files with 117 additions and 115 deletions

View File

@@ -41,9 +41,10 @@ func (scheduler *Scheduler) NextScheduleTime(cfg *model.Config, now time.Time, p
func (scheduler *Scheduler) ScheduleJob(cfg *model.Config, pendingJobs bool, lastSuccessfulJob *model.Job) (*model.Job, *model.AppError) {
mlog.Debug("Scheduling Job", mlog.String("scheduler", scheduler.Name()))
if job, err := scheduler.App.Srv.Jobs.CreateJob(model.JOB_TYPE_PLUGINS, nil); err != nil {
job, err := scheduler.App.Srv.Jobs.CreateJob(model.JOB_TYPE_PLUGINS, nil)
if err != nil {
return nil, err
} else {
return job, nil
}
return job, nil
}

View File

@@ -73,16 +73,14 @@ func (worker *Worker) DoJob(job *model.Job) {
return
}
err := worker.app.DeleteAllExpiredPluginKeys()
if err == nil {
mlog.Info("Worker: Job is complete", mlog.String("worker", worker.name), mlog.String("job_id", job.Id))
worker.setJobSuccess(job)
return
} else {
if err := worker.app.DeleteAllExpiredPluginKeys(); err != nil {
mlog.Error("Worker: Failed to delete expired keys", mlog.String("worker", worker.name), mlog.String("job_id", job.Id), mlog.String("error", err.Error()))
worker.setJobError(job, err)
return
}
mlog.Info("Worker: Job is complete", mlog.String("worker", worker.name), mlog.String("job_id", job.Id))
worker.setJobSuccess(job)
}
func (worker *Worker) setJobSuccess(job *model.Job) {