X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fterminal-ssh.go;h=fcef4f9bc54b8e0f0aed843182f6a8508af0e227;hb=f223efc5e5a08764cf9f78fb5f38917ed949407f;hp=9a9f5fd006d486ce08b5d6aec6f7340d02922240;hpb=17812a0a4388ab0c87084ef7e8118d87e8fadcf7;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsserver/terminal-ssh.go b/lib/xdsserver/terminal-ssh.go
index 9a9f5fd..fcef4f9 100644
--- a/lib/xdsserver/terminal-ssh.go
+++ b/lib/xdsserver/terminal-ssh.go
@@ -223,13 +223,15 @@ func (t *TermSSH) Open(sock *socketio.Socket, sessID string) (*xsapiv1.TerminalC
 
 // Close a terminal
 func (t *TermSSH) Close() (*xsapiv1.TerminalConfig, error) {
-	// nothing to do when not open
-	if t.termCfg.Status != xsapiv1.StatusTermOpen {
+	// nothing to do when not open or closing
+    if ! (t.termCfg.Status == xsapiv1.StatusTermOpen || t.termCfg.Status == xsapiv1.StatusTermClosing) {
 		return &t.termCfg, nil
 	}
 
 	err := t.sshWS.Signal("SIGTERM")
 
+	t.termCfg.Status = xsapiv1.StatusTermClosing
+
 	return &t.termCfg, err
 }
 
@@ -246,6 +248,8 @@ func (t *TermSSH) Resize(cols, rows uint16) (*xsapiv1.TerminalConfig, error) {
 		t.termCfg.Rows = rows
 	}
 
+	t.LogSillyf("Terminal resize id=%v, cols=%v, rows=%v", t.termCfg.ID, cols, rows)
+
 	err := t.sshWS.TerminalSetSize(t.termCfg.Rows, t.termCfg.Cols)
 	if err != nil {
 		t.Log.Errorf("Error ssh TerminalSetSize: %v", err)