Merge branch '669-follow-up-from-update-gitlab-shell-version-to-14-25-0' into 'main'

Include error and log as Error when recovering

Closes #669

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/825



Merged-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>

internal/sshd/connection.go

@@ -132,7 +132,7 @@ func (c *connection) handleRequests(ctx context.Context, sconn *ssh.ServerConn,
 			// Prevent a panic in a single session from taking out the whole server
 			defer func() {
 				if err := recover(); err != nil {
-					ctxlog.WithField("recovered_error", err).Warn("panic handling session")
+					ctxlog.WithField("recovered_error", err).Error("panic handling session")
 				}
 			}()
 

internal/sshd/sshd.go

@@ -185,7 +185,7 @@ func (s *Server) handleConn(ctx context.Context, nconn net.Conn) {
 	// Prevent a panic in a single connection from taking out the whole server
 	defer func() {
 		if err := recover(); err != nil {
-			ctxlog.Warn("panic handling session")
+			ctxlog.WithField("recovered_error", err).Error("panic handling session")
 
 			metrics.SliSshdSessionsErrorsTotal.Inc()
 		}