fix #480 (#484)

Author: xiantang

runner/engine.go

@@ -27,7 +27,6 @@ type Engine struct {
 	watcherStopCh  chan bool
 	buildRunCh     chan bool
 	buildRunStopCh chan bool
-	canExit        chan bool
 	binStopCh      chan bool
 	exitCh         chan bool
 
@@ -56,7 +55,6 @@ func NewEngineWithConfig(cfg *Config, debugMode bool) (*Engine, error) {
 		watcherStopCh:  make(chan bool, 10),
 		buildRunCh:     make(chan bool, 1),
 		buildRunStopCh: make(chan bool, 1),
-		canExit:        make(chan bool, 1),
 		binStopCh:      make(chan bool),
 		exitCh:         make(chan bool),
 		fileChecksums:  &checksumMap{m: make(map[string]string)},
@@ -374,19 +372,16 @@ func (e *Engine) buildRun() {
 	select {
 	case <-e.buildRunStopCh:
 		return
-	case <-e.canExit:
 	default:
 	}
 	var err error
 	if err = e.runPreCmd(); err != nil {
-		e.canExit <- true
 		e.runnerLog("failed to execute pre_cmd: %s", err.Error())
 		if e.config.Build.StopOnError {
 			return
 		}
 	}
 	if err = e.building(); err != nil {
-		e.canExit <- true
 		e.buildLog("failed to build, error: %s", err.Error())
 		_ = e.writeBuildErrorLog(err.Error())
 		if e.config.Build.StopOnError {
@@ -399,7 +394,6 @@ func (e *Engine) buildRun() {
 		return
 	case <-e.exitCh:
 		e.mainDebug("exit in buildRun")
-		close(e.canExit)
 		return
 	default:
 	}
@@ -521,7 +515,6 @@ func (e *Engine) runBin() error {
 			case <-e.exitCh:
 				e.mainDebug("exit in runBin")
 				wg.Wait()
-				close(e.canExit)
 			default:
 			}
 		}()
@@ -595,7 +588,6 @@ func (e *Engine) cleanup() {
 
 	e.mainDebug("waiting for exit...")
 
-	<-e.canExit
 	e.running = false
 	e.mainDebug("exited")
 }

runner/engine_test.go

@@ -339,6 +339,7 @@ func TestRebuild(t *testing.T) {
 	engine.Stop()
 	t.Logf("engine stopped")
 	wg.Wait()
+	time.Sleep(time.Second * 1)
 	assert.True(t, checkPortConnectionRefused(port))
 }
 
@@ -449,6 +450,41 @@ func TestCtrlCWhenREngineIsRunning(t *testing.T) {
 	assert.False(t, engine.running)
 }
 
+func TestCtrlCWithFailedBin(t *testing.T) {
+	timeout := 5 * time.Second
+	done := make(chan struct{})
+	go func() {
+		dir := initWithQuickExitGoCode(t)
+		chdir(t, dir)
+		engine, err := NewEngine("", true)
+		assert.NoError(t, err)
+		engine.config.Build.Bin = "<WRONGCOMAMND>"
+		sigs := make(chan os.Signal, 1)
+		signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+		var wg sync.WaitGroup
+		wg.Add(1)
+		go func() {
+			engine.Run()
+			t.Logf("engine stopped")
+			wg.Done()
+		}()
+		go func() {
+			<-sigs
+			engine.Stop()
+			t.Logf("engine stopped")
+		}()
+		time.Sleep(time.Second * 1)
+		sigs <- syscall.SIGINT
+		wg.Wait()
+		close(done)
+	}()
+	select {
+	case <-done:
+	case <-time.After(timeout):
+		t.Error("Test timed out")
+	}
+}
+
 func TestFixCloseOfChannelAfterCtrlC(t *testing.T) {
 	// fix https://github.com/cosmtrek/air/issues/294
 	dir := initWithBuildFailedCode(t)