1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-24 23:04:40 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 合并终端返回数据的代码

Browse source
This commit is contained in:
Wankko Ree 2023-04-06 01:16:47 +08:00 committed by zhengkunwang223
parent 57a6417812
commit db64cf02bd
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
backend/utils/terminal/ws_session.go
View file

@ -164,19 +164,6 @@ func (sws *LogicSshWsSession) sendComboOutput(exitCh chan bool) {
return return
} }
bs := sws.comboOutput.Bytes() bs := sws.comboOutput.Bytes()
if string(bs) == string([]byte{13, 10, 108, 111, 103, 111, 117, 116, 13, 10}) {
err := wsConn.WriteMessage(websocket.TextMessage, bs)
if err != nil {
global.LOG.Errorf("ssh sending combo output to webSocket failed, err: %v", err)
}
_, err = sws.logBuff.Write(bs)
if err != nil {
global.LOG.Errorf("combo output to log buffer failed, err: %v", err)
}
sws.comboOutput.buffer.Reset()
sws.Close()
return
}
if len(bs) > 0 { if len(bs) > 0 {
err := wsConn.WriteMessage(websocket.TextMessage, bs) err := wsConn.WriteMessage(websocket.TextMessage, bs)
if err != nil { if err != nil {
@ -188,6 +175,10 @@ func (sws *LogicSshWsSession) sendComboOutput(exitCh chan bool) {
} }
sws.comboOutput.buffer.Reset() sws.comboOutput.buffer.Reset()
} }
if string(bs) == string([]byte{13, 10, 108, 111, 103, 111, 117, 116, 13, 10}) {
sws.Close()
return
}
case <-exitCh: case <-exitCh:
return return