fix logic to wait for executor stop (#392)

* fix logic to wait for executor stop

* fix test

Co-authored-by: hiroebe <hiroebe41@gmail.com>

executor.go

@@ -27,14 +27,16 @@ const (
 type executor struct {
 	jobFunctions   chan jobFunction
 	stopCh         chan struct{}
+	stoppedCh      chan struct{}
 	limitMode      limitMode
 	maxRunningJobs *semaphore.Weighted
 }
 
 func newExecutor() executor {
 	return executor{
 		jobFunctions: make(chan jobFunction, 1),
-		stopCh:       make(chan struct{}, 1),
+		stopCh:       make(chan struct{}),
+		stoppedCh:    make(chan struct{}),
 	}
 }
 
@@ -113,13 +115,13 @@ func (e *executor) start() {
 		case <-e.stopCh:
 			cancel()
 			runningJobsWg.Wait()
-			e.stopCh <- struct{}{}
+			close(e.stoppedCh)
 			return
 		}
 	}
 }
 
 func (e *executor) stop() {
-	e.stopCh <- struct{}{}
-	<-e.stopCh
+	close(e.stopCh)
+	<-e.stoppedCh
 }

executor_test.go

@@ -26,12 +26,12 @@ func Test_ExecutorExecute(t *testing.T) {
 		runState:   &runState,
 	}
 
-	e.stop()
 	wg.Wait()
+	e.stop()
 }
 
 func Test_ExecutorPanicHandling(t *testing.T) {
-	panicHandled := make(chan bool)
+	panicHandled := make(chan bool, 1)
 
 	handler := func(jobName string, recoverData interface{}) {
 		fmt.Println("PanicHandler called:")
@@ -60,8 +60,8 @@ func Test_ExecutorPanicHandling(t *testing.T) {
 		runState:   &runState,
 	}
 
-	e.stop()
 	wg.Wait()
+	e.stop()
 
 	state := <-panicHandled
 	assert.Equal(t, state, true)