Merge pull request #156 from jasonlvhit/bugfix/142_53

fixes #142 by removing the j.nextRun.After(now) check and fixes #53 b…

gocron_test.go

@@ -57,10 +57,17 @@ func testJobWithInterval(t *testing.T, sched *Scheduler, job *Job, expectedTimeB
 func TestSafeExecution(t *testing.T) {
 	sched := NewScheduler()
 	success := false
+	var wc sync.WaitGroup
+	wc.Add(1)
+
 	sched.Every(1).Second().Do(func(mutableValue *bool) {
 		*mutableValue = !*mutableValue
+		wc.Done()
 	}, &success)
+
 	sched.RunAll()
+	wc.Wait()
+
 	assert.Equal(t, true, success, "Task did not get called")
 }
 

job.go

@@ -63,11 +63,6 @@ func (j *Job) run() ([]reflect.Value, error) {
 		locker.Lock(key)
 		defer locker.Unlock(key)
 	}
-
-	j.lastRun = time.Now()
-	if err := j.scheduleNextRun(); err != nil {
-		return nil, err
-	}
 	result, err := callJobFuncWithParams(j.funcs[j.jobFunc], j.fparams[j.jobFunc])
 	if err != nil {
 		return nil, err
@@ -94,7 +89,11 @@ func (j *Job) Do(jobFun interface{}, params ...interface{}) error {
 	j.funcs[fname] = jobFun
 	j.fparams[fname] = params
 	j.jobFunc = fname
-	j.scheduleNextRun()
+
+	now := time.Now().In(j.loc)
+	if !j.nextRun.After(now) {
+		j.scheduleNextRun()
+	}
 
 	return nil
 }
@@ -201,10 +200,6 @@ func (j *Job) scheduleNextRun() error {
 		j.lastRun = now
 	}
 
-	if j.nextRun.After(now) {
-		return nil
-	}
-
 	periodDuration, err := j.periodDuration()
 	if err != nil {
 		return err

scheduler.go

@@ -87,7 +87,9 @@ func (s *Scheduler) RunPending() {
 
 	if n != 0 {
 		for i := 0; i < n; i++ {
-			runnableJobs[i].run()
+			go runnableJobs[i].run()
+			runnableJobs[i].lastRun = time.Now()
+			runnableJobs[i].scheduleNextRun()
 		}
 	}
 }
@@ -100,7 +102,7 @@ func (s *Scheduler) RunAll() {
 // RunAllwithDelay runs all jobs with delay seconds
 func (s *Scheduler) RunAllwithDelay(d int) {
 	for i := 0; i < s.size; i++ {
-		s.jobs[i].run()
+		go s.jobs[i].run()
 		if 0 != d {
 			time.Sleep(time.Duration(d))
 		}