summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2022-04-01 00:59:28 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2022-04-01 00:59:28 +0000
commit969bf2e27edf49c3998b62d64507c79909624e81 (patch)
tree18579ee871b692f456da329e4395e65188b82319
parent7064a5cfcbe1542557a7ad53ad1d765997643d1b (diff)
parent00ad9a8a4211c84144182cb439499216c084b356 (diff)
downloadgitlab-shell-969bf2e27edf49c3998b62d64507c79909624e81.tar.gz
Merge branch 'improve-login-grace-timeout-msg' into 'main'
Improve login grace timeout message Closes #553 See merge request gitlab-org/gitlab-shell!586
-rw-r--r--internal/sshd/sshd.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/sshd/sshd.go b/internal/sshd/sshd.go
index e8743ae..b661233 100644
--- a/internal/sshd/sshd.go
+++ b/internal/sshd/sshd.go
@@ -194,7 +194,7 @@ func (s *Server) initSSHConnection(ctx context.Context, nconn net.Conn) (sconn *
defer func() {
// If time.Stop() equals false, that means that AfterFunc has been executed
if !timer.Stop() {
- err = fmt.Errorf("initSSHConnection: ssh handshake timeout")
+ err = fmt.Errorf("initSSHConnection: ssh handshake timeout of %v", s.Config.Server.LoginGraceTime())
}
}()