Commit285b4e7

committed

Avoid clobbering attach error with close errors

We want to send the error from failing to wait for the version command,not the error from closing/killing the pty or process.

1 parentaeb24d4 commit285b4e7Copy full SHA for 285b4e7

File tree

-6

lines changed

-6

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -279,13 +279,13 @@ func (rpty *screenReconnectingPTY) doAttach(ctx context.Context, height, width u`
`279`	`279`	`// the same name.`
`280`	`280`	`err=rpty.sendCommand(ctx,"version",nil)`
`281`	`281`	`iferr!=nil {`
`282`		`-err:=ptty.Close()`
`283`		`-iferr!=nil {`
`284`		`-logger.Debug(ctx,"closed ptty with error",slog.Error(err))`
	`282`	`+closeErr:=ptty.Close()`
	`283`	`+ifcloseErr!=nil {`
	`284`	`+logger.Debug(ctx,"closed ptty with error",slog.Error(closeErr))`
`285`	`285`	`}`
`286`		`-err=process.Kill()`
`287`		`-iferr!=nil {`
`288`		`-logger.Debug(ctx,"killed process with error",slog.Error(err))`
	`286`	`+closeErr=process.Kill()`
	`287`	`+ifcloseErr!=nil {`
	`288`	`+logger.Debug(ctx,"killed process with error",slog.Error(closeErr))`
`289`	`289`	`}`
`290`	`290`	`rpty.metrics.WithLabelValues("screen_wait").Add(1)`
`291`	`291`	`returnnil,nil,err`

Comments

(0)