Remove stopChan from Scheduler

example_test.go

@@ -55,6 +55,7 @@ func ExampleScheduler_Stop() {
 	s := gocron.NewScheduler(time.UTC)
 	_, _ = s.Every(1).Second().Do(task)
 	s.StartAsync()
+	time.Sleep(time.Second * 5)
 	s.Stop()
 }
 
@@ -120,7 +121,7 @@ func ExampleJob_LastRun() {
 			time.Sleep(time.Second)
 		}
 	}()
-	<-s.StartAsync()
+	s.StartBlocking()
 }
 
 func ExampleJob_NextRun() {
@@ -132,7 +133,7 @@ func ExampleJob_NextRun() {
 			time.Sleep(time.Second)
 		}
 	}()
-	<-s.StartAsync()
+	s.StartAsync()
 }
 
 func ExampleJob_RunCount() {
@@ -144,7 +145,7 @@ func ExampleJob_RunCount() {
 			time.Sleep(time.Second)
 		}
 	}()
-	<-s.StartAsync()
+	s.StartAsync()
 }
 
 func ExampleJob_RemoveAfterLastRun() {

scheduler.go

@@ -19,8 +19,7 @@ type Scheduler struct {
 	location      *time.Location
 
 	runningMutex sync.RWMutex
-	running      bool          // represents if the scheduler is running at the moment or not
-	stopChan     chan struct{} // signal to stop scheduling
+	running      bool // represents if the scheduler is running at the moment or not
 
 	time timeWrapper // wrapper around time.Time
 }
@@ -31,28 +30,21 @@ func NewScheduler(loc *time.Location) *Scheduler {
 		jobs:     make([]*Job, 0),
 		location: loc,
 		running:  false,
-		stopChan: make(chan struct{}, 1),
 		time:     &trueTime{},
 	}
 }
 
 // StartBlocking starts all jobs and blocks the current thread
 func (s *Scheduler) StartBlocking() {
-	<-s.StartAsync()
+	s.StartAsync()
+	<-make(chan bool)
 }
 
 // StartAsync starts all jobs without blocking the current thread
-func (s *Scheduler) StartAsync() chan struct{} {
-	if s.IsRunning() {
-		return s.stopChan
+func (s *Scheduler) StartAsync() {
+	if !s.IsRunning() {
+		s.start()
 	}
-	s.start()
-	go func() {
-		<-s.stopChan
-		s.setRunning(false)
-		return
-	}()
-	return s.stopChan
 }
 
 //start starts the scheduler, scheduling and running jobs
@@ -408,7 +400,6 @@ func (s *Scheduler) Stop() {
 
 func (s *Scheduler) stop() {
 	s.setRunning(false)
-	s.stopChan <- struct{}{}
 }
 
 // Do specifies the jobFunc that should be called every time the Job runs

scheduler_test.go

@@ -78,9 +78,9 @@ func TestExecutionSeconds(t *testing.T) {
 		}
 	})
 
-	stop := sched.StartAsync()
+	sched.StartAsync()
 	<-jobDone // Wait job done
-	close(stop)
+	sched.Stop()
 
 	mu.RLock()
 	defer mu.RUnlock()
@@ -389,9 +389,9 @@ func TestScheduler_Stop(t *testing.T) {
 	})
 	t.Run("stops a running scheduler through StartAsync chan", func(t *testing.T) {
 		s := NewScheduler(time.UTC)
-		c := s.StartAsync()
+		s.StartAsync()
 		assert.True(t, s.IsRunning())
-		close(c)
+		s.Stop()
 		time.Sleep(1 * time.Millisecond) // wait for stop goroutine to catch up
 		assert.False(t, s.IsRunning())
 	})