Merge pull request #475 from symfony-cli/hanging-fix

Hanging fix

local/runner.go

@@ -236,8 +236,6 @@ func (r *Runner) Run() error {
 		// Command exited
 		case err := <-cmdExitChan:
 			logger.Debug().Msg("Received exit")
-			err = errors.Wrapf(err, `command "%s" failed`, r.pidFile)
-
 			if err == nil && r.SuccessHook != nil {
 				logger.Debug().Msg("Running success hook")
 				r.SuccessHook(r, cmd)
@@ -254,36 +252,23 @@ func (r *Runner) Run() error {
 				logger.Debug().Msg("Removing pid file")
 				return r.pidFile.Remove()
 			}
-			logger.Debug().Msg("Looping")
 
-			// Command is set up to restart on exit (usually PHP builtin
-			// server), so we restart immediately without waiting
+			// Command is set up to restart on exit (usually PHP builtin server)
 			if r.AlwaysRestartOnExit {
-				logger.Error().Msg("command exited, restarting it immediately")
+				logger.Debug().Msg("Looping")
+				// In case of error we want to wait up-to 5 seconds before
+				// restarting the command, this avoids overloading the system with a
+				// failing command
+				if err != nil {
+					logger.Error().Msgf(`command exited: %s, waiting 5 seconds before restarting it`, err)
+					timer.Reset(5 * time.Second)
+				} else {
+					logger.Error().Msg("command exited, restarting it immediately")
+				}
 				continue
 			}
 
-			// In case of error we want to wait up-to 5 seconds before
-			// restarting the command, this avoids overloading the system with a
-			// failing command
-			if err != nil {
-				logger.Error().Msgf(`command exited: %s, waiting 5 seconds before restarting it`, err)
-				timer.Reset(5 * time.Second)
-			}
-
-			// Wait for a timer to expire or a file to be changed to restart
-			// or a signal to be received to exit
-			logger.Debug().Msg("Waiting for channels")
-			select {
-			case sig := <-sigChan:
-				logger.Info().Msgf(`Signal "%s" received, exiting`, sig)
-				return nil
-			case <-restartChan:
-				logger.Debug().Msg("Received restart")
-				timer.Stop()
-			case <-timer.C:
-				logger.Debug().Msg("Received timer message")
-			}
+			return nil
 		}
 
 		logger.Info().Msg("Restarting command")
@@ -295,7 +280,7 @@ func (r *Runner) buildCmd() (*exec.Cmd, error) {
 	cmd.Env = os.Environ()
 	cmd.Dir = r.pidFile.Dir
 
-	if err := buildCmd(cmd); err != nil {
+	if err := buildCmd(cmd, r.mode == RunnerModeOnce && terminal.Stdin.IsInteractive()); err != nil {
 		return nil, err
 	}
 

local/runner_posix.go

@@ -8,11 +8,12 @@ import (
 	"syscall"
 )
 
-func buildCmd(cmd *exec.Cmd) error {
+func buildCmd(cmd *exec.Cmd, foreground bool) error {
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		// isolate each command in a new process group that we can cleanly send
 		// signal to when we want to stop it
-		Setpgid: true,
+		Setpgid:    true,
+		Foreground: foreground,
 	}
 
 	return nil

local/runner_windows.go

@@ -2,6 +2,6 @@ package local
 
 import "os/exec"
 
-func buildCmd(*exec.Cmd) error {
+func buildCmd(*exec.Cmd, bool) error {
 	return nil
 }