From ebd20b96bab3a959df064a8698a733bb30dcea3d Mon Sep 17 00:00:00 2001 From: John Roesler Date: Mon, 9 Oct 2023 16:11:49 -0500 Subject: [PATCH] replace all internal uses of RemoveByReference --- scheduler.go | 14 +++++++------- scheduler_test.go | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scheduler.go b/scheduler.go index 1bac1b04..72f5c0c3 100644 --- a/scheduler.go +++ b/scheduler.go @@ -221,7 +221,7 @@ func (s *Scheduler) scheduleNextRun(job *Job) (bool, nextRun) { } if !job.shouldRun() { - s.RemoveByReference(job) + _ = s.RemoveByID(job) return false, nextRun{} } @@ -750,7 +750,7 @@ func (s *Scheduler) RemoveByTags(tags ...string) error { } for _, job := range jobs { - s.RemoveByReference(job) + _ = s.RemoveByID(job) } return nil } @@ -770,7 +770,7 @@ func (s *Scheduler) RemoveByTagsAny(tags ...string) error { } for job := range mJob { - s.RemoveByReference(job) + _ = s.RemoveByID(job) } return errs @@ -947,7 +947,7 @@ func (s *Scheduler) doCommon(jobFun interface{}, params ...interface{}) (*Job, e if job.error != nil { // delete the job from the scheduler as this job // cannot be executed - s.RemoveByReference(job) + _ = s.RemoveByID(job) return nil, job.error } @@ -958,7 +958,7 @@ func (s *Scheduler) doCommon(jobFun interface{}, params ...interface{}) (*Job, e if val.Kind() != reflect.Func { // delete the job for the same reason as above - s.RemoveByReference(job) + _ = s.RemoveByID(job) return nil, ErrNotAFunction } @@ -985,13 +985,13 @@ func (s *Scheduler) doCommon(jobFun interface{}, params ...interface{}) (*Job, e } if len(params) != expectedParamLength { - s.RemoveByReference(job) + _ = s.RemoveByID(job) job.error = wrapOrError(job.error, ErrWrongParams) return nil, job.error } if job.runWithDetails && val.Type().In(len(params)).Kind() != reflect.ValueOf(*job).Kind() { - s.RemoveByReference(job) + _ = s.RemoveByID(job) job.error = wrapOrError(job.error, ErrDoWithJobDetails) return nil, job.error } diff --git a/scheduler_test.go b/scheduler_test.go index 48df2af6..d794dee6 100644 --- a/scheduler_test.go +++ b/scheduler_test.go @@ -588,7 +588,7 @@ func TestScheduler_RemoveByReference(t *testing.T) { assert.Equal(t, 2, s.Len(), "Incorrect number of jobs") - s.RemoveByReference(job1) + _ = s.RemoveByID(job1) s.jobsMutex.RLock() defer s.jobsMutex.RUnlock() assert.NotContains(t, s.jobs, job1.id) @@ -607,7 +607,7 @@ func TestScheduler_RemoveByReference(t *testing.T) { s.StartAsync() - s.RemoveByReference(j) + _ = s.RemoveByID(j) select { case <-time.After(200 * time.Millisecond): @@ -1693,9 +1693,9 @@ func TestScheduler_SetMaxConcurrentJobs(t *testing.T) { } if tc.removeJobs { - s.RemoveByReference(j1) - s.RemoveByReference(j2) - s.RemoveByReference(j3) + _ = s.RemoveByID(j1) + _ = s.RemoveByID(j2) + _ = s.RemoveByID(j3) } else { s.Stop() } @@ -1912,7 +1912,7 @@ func TestScheduler_Update(t *testing.T) { require.NoError(t, err) time.Sleep(550 * time.Millisecond) - s.RemoveByReference(j) + _ = s.RemoveByID(j) j, err = s.Every("750ms").WaitForSchedule().Do(func() { counterMutex.Lock(); defer counterMutex.Unlock(); counter++ }) require.NoError(t, err)