Skip to content

Commit e5b0729

Browse files
committed
Revert SSH conn handling
1 parent 9936923 commit e5b0729

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

agent/agent.go

+8-17
Original file line numberDiff line numberDiff line change
@@ -645,24 +645,15 @@ func (a *agent) init(ctx context.Context) {
645645
sshLogger.Info(ctx, "ssh connection ended", slog.Error(err))
646646
},
647647
Handler: func(session ssh.Session) {
648-
err := a.trackConnGoroutine(func() {
649-
err := a.handleSSHSession(session)
650-
var exitError *exec.ExitError
651-
if xerrors.As(err, &exitError) {
652-
a.logger.Debug(ctx, "ssh session returned", slog.Error(exitError))
653-
_ = session.Exit(exitError.ExitCode())
654-
return
655-
}
656-
if err != 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+
var exitError *exec.ExitError
650+
if xerrors.As(err, &exitError) {
651+
a.logger.Debug(ctx, "ssh session returned", slog.Error(exitError))
652+
_ = session.Exit(exitError.ExitCode())
653+
return
654+
}
664655
if err != nil {
665-
a.logger.Warn(ctx, "track ssh session failed", slog.Error(err))
656+
a.logger.Warn(ctx, "ssh session failed", slog.Error(err))
666657
// This exit code is designed to be unlikely to be confused for a legit exit code
667658
// from the process.
668659
_ = session.Exit(MagicSessionErrorCode)

0 commit comments

Comments
 (0)