From d63648ae8fbcfd2e7ad250cc9db7535da7e36be7 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Wed, 25 Sep 2024 17:15:17 +0800 Subject: [PATCH] fix(webconsole): close session when ssh session closed (#21294) --- pkg/webconsole/server/ssh_server.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/webconsole/server/ssh_server.go b/pkg/webconsole/server/ssh_server.go index dcc11fdbe5..ba3406f86b 100644 --- a/pkg/webconsole/server/ssh_server.go +++ b/pkg/webconsole/server/ssh_server.go @@ -236,6 +236,7 @@ func (s *WebsocketServer) ServeHTTP(w http.ResponseWriter, r *http.Request) { delSftpClient(s.Session.Id) s.sftp.Close() s.conn.Close() + s.Session.Close() }() stop := make(chan bool) @@ -265,11 +266,12 @@ func (s *WebsocketServer) ServeHTTP(w http.ResponseWriter, r *http.Request) { err = s.session.Wait() if err != nil { + log.Warningf("session %s wait error: %v", s.Session.Id, err) s.StdinPipe.Write([]byte(err.Error())) } }() <-done stop <- true - log.Infof("ssh %s@%s:%d complete", s.Username, s.Host, s.Port) + log.Infof("ssh %s@%s:%d complete, session_id: %s", s.Username, s.Host, s.Port, s.Session.Id) }