Commit29cbc54

authored

Reconnecting PTY waits for command output or EOF (#7279)

Signed-off-by: Spike Curtis <spike@coder.com>

1 parentf1dfeb0 commit29cbc54Copy full SHA for 29cbc54

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1036,12 +1036,9 @@ func (a *agent) handleReconnectingPTY(ctx context.Context, logger slog.Logger, m`
`1036`	`1036`	`<-ctx.Done()`
`1037`	`1037`	`_=process.Kill()`
`1038`	`1038`	`}()`
`1039`		`-gofunc() {`
`1040`		`-// If the process dies randomly, we should`
`1041`		`-// close the pty.`
`1042`		`-_=process.Wait()`
`1043`		`-rpty.Close()`
`1044`		`-}()`
	`1039`	`+// We don't need to separately monitor for the process exiting.`
	`1040`	`+// When it exits, our ptty.OutputReader() will return EOF after`
	`1041`	`+// reading all process output.`
`1045`	`1042`	`iferr=a.trackConnGoroutine(func() {`
`1046`	`1043`	`buffer:=make([]byte,1024)`
`1047`	`1044`	`for {`

Comments

(0)