Commit9b0b80a

committed

Revert SSH conn handling

1 parent9936923 commit9b0b80aCopy full SHA for 9b0b80a

File tree

-18

lines changed

-18

lines changed

Lines changed: 8 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -645,24 +645,15 @@ func (a *agent) init(ctx context.Context) {`
`645`	`645`	`sshLogger.Info(ctx,"ssh connection ended",slog.Error(err))`
`646`	`646`	`},`
`647`	`647`	`Handler:func(session ssh.Session) {`
`648`		`-err:=a.trackConnGoroutine(func() {`
`649`		`-err:=a.handleSSHSession(session)`
`650`		`-varexitError*exec.ExitError`
`651`		`-ifxerrors.As(err,&exitError) {`
`652`		`-a.logger.Debug(ctx,"ssh session returned",slog.Error(exitError))`
`653`		`-_=session.Exit(exitError.ExitCode())`
`654`		`-return`
`655`		`-}`
`656`		`-iferr!=nil {`
`657`		`-a.logger.Warn(ctx,"ssh session failed",slog.Error(err))`
`658`		`-// This exit code is designed to be unlikely to be confused for a legit exit code`
`659`		`-// from the process.`
`660`		`-_=session.Exit(MagicSessionErrorCode)`
`661`		`-return`
`662`		`-}`
`663`		`-})`
	`648`	`+err:=a.handleSSHSession(session)`
	`649`	`+varexitError*exec.ExitError`
	`650`	`+ifxerrors.As(err,&exitError) {`
	`651`	`+a.logger.Debug(ctx,"ssh session returned",slog.Error(exitError))`
	`652`	`+_=session.Exit(exitError.ExitCode())`
	`653`	`+return`
	`654`	`+}`
`664`	`655`	`iferr!=nil {`
`665`		`-a.logger.Warn(ctx,"trackssh session failed",slog.Error(err))`
	`656`	`+a.logger.Warn(ctx,"ssh session failed",slog.Error(err))`
`666`	`657`	`// This exit code is designed to be unlikely to be confused for a legit exit code`
`667`	`658`	`// from the process.`
`668`	`659`	`_=session.Exit(MagicSessionErrorCode)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ ExtractCommandPathsLoop:`
`121`	`121`
`122`	`122`	`got:=buf.Bytes()`
`123`	`123`	`// Remove CRLF newlines (Windows).`
`124`		`-//got = bytes.ReplaceAll(got, []byte{'\r', '\n'}, []byte{'\n'})`
	`124`	`+got=bytes.ReplaceAll(got, []byte{'\r','\n'}, []byte{'\n'})`
`125`	`125`
`126`	`126`	// The `coder templates create --help` command prints the path
`127`	`127`	`// to the working directory (--directory flag default value).`

Comments

(0)