Portainer
/
portainer
mirror of https://github.com/portainer/portainer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(api): update scheduler to match new cron lib API (#3157)

pull/3159/head
Anthony Lapenna 2019-09-15 10:47:44 +12:00 committed by GitHub
parent 8e922dbfc6
commit baa64ca927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/cron/scheduler.go
View File

@ -13,13 +13,14 @@ type JobScheduler struct {
// NewJobScheduler initializes a new service // NewJobScheduler initializes a new service
func NewJobScheduler() *JobScheduler { func NewJobScheduler() *JobScheduler {
return &JobScheduler{ return &JobScheduler{
cron: cron.New(), cron: cron.New(cron.WithSeconds()),
} }
} }
// ScheduleJob schedules the execution of a job via a runner // ScheduleJob schedules the execution of a job via a runner
func (scheduler *JobScheduler) ScheduleJob(runner portainer.JobRunner) error { func (scheduler *JobScheduler) ScheduleJob(runner portainer.JobRunner) error {
return scheduler.cron.AddJob(runner.GetSchedule().CronExpression, runner) _, err := scheduler.cron.AddJob(runner.GetSchedule().CronExpression, runner)
return err
} }
// UpdateSystemJobSchedule updates the first occurence of the specified // UpdateSystemJobSchedule updates the first occurence of the specified
@ -35,7 +36,7 @@ func (scheduler *JobScheduler) UpdateSystemJobSchedule(jobType portainer.JobType
for _, entry := range cronEntries { for _, entry := range cronEntries {
if entry.Job.(portainer.JobRunner).GetSchedule().JobType == jobType { if entry.Job.(portainer.JobRunner).GetSchedule().JobType == jobType {
err := newCron.AddJob(newCronExpression, entry.Job) _, err := newCron.AddJob(newCronExpression, entry.Job)
if err != nil { if err != nil {
return err return err
} }
@ -69,7 +70,7 @@ func (scheduler *JobScheduler) UpdateJobSchedule(runner portainer.JobRunner) err
jobRunner = entry.Job jobRunner = entry.Job
} }
err := newCron.AddJob(runner.GetSchedule().CronExpression, jobRunner) _, err := newCron.AddJob(runner.GetSchedule().CronExpression, jobRunner)
if err != nil { if err != nil {
return err return err
} }