summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Bajao <ebajao@gitlab.com>2022-05-11 04:02:20 +0000
committerPatrick Bajao <ebajao@gitlab.com>2022-05-11 04:02:20 +0000
commit970d533eb4db3667342659ae5883f25eaa202e9d (patch)
tree73f9dacab62e74175c63c8bc1316d0775c4a4fb8
parentd700799b357caa0a738aadb857e4f9914c86dd32 (diff)
parent8f1f3fa10b141de3682a378d231224cb37a68014 (diff)
downloadgitlab-shell-970d533eb4db3667342659ae5883f25eaa202e9d.tar.gz
Merge branch 'id-sync-sshd-sessions' into 'main'
Log the error that happens on sconn.Wait() See merge request gitlab-org/gitlab-shell!613
-rw-r--r--internal/sshd/sshd.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/internal/sshd/sshd.go b/internal/sshd/sshd.go
index 319731e..99fa3c9 100644
--- a/internal/sshd/sshd.go
+++ b/internal/sshd/sshd.go
@@ -199,9 +199,11 @@ func (s *Server) handleConn(ctx context.Context, nconn net.Conn) {
}
})
+ reason := sconn.Wait()
ctxlog.WithFields(log.Fields{
"duration_s": time.Since(started).Seconds(),
"establish_session_duration_s": establishSessionDuration,
+ "reason": reason,
}).Info("server: handleConn: done")
}