add diff channels back

Signed-off-by: Daniel Huckins <dhuckins@users.noreply.github.com>
hashicorp · May 23, 2023 · 7258c14 · 7258c14
1 parent 373a57e
commit 7258c14
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/command/agent/exec/exec.go b/command/agent/exec/exec.go
@@ -63,7 +63,7 @@ type Server struct {
 	childProcessState childProcessState
 
 	// exit channel of the child process
-	childProcessExitCh <-chan int
+	childProcessExitCh chan int
 }
 
 type ProcessExitError struct {
@@ -76,9 +76,10 @@ func (e *ProcessExitError) Error() string {
 
 func NewServer(cfg *ServerConfig) *Server {
 	server := Server{
-		logger:            cfg.Logger,
-		config:            cfg,
-		childProcessState: childProcessStateNotStarted,
+		logger:             cfg.Logger,
+		config:             cfg,
+		childProcessState:  childProcessStateNotStarted,
+		childProcessExitCh: make(chan int),
 	}
 
 	return &server
@@ -247,7 +248,15 @@ func (s *Server) bounceCmd(newEnvVars []string) error {
 		return err
 	}
 	s.childProcess = proc
-	s.childProcessExitCh = s.childProcess.ExitCh()
+	// did not work
+	// s.childProcessExitCh = s.childProcess.ExitCh()
+	go func() {
+		select {
+		case exitCode := <-proc.ExitCh():
+			s.childProcessExitCh <- exitCode
+			return
+		}
+	}()
 
 	if err := s.childProcess.Start(); err != nil {
 		return fmt.Errorf("error starting child process: %w", err)