Merge pull request #72 from layer5io/kumarabd/feature/exec

fixes for stale terminal sessions
meshery · Jun 28, 2021 · 49e040e · 49e040e
2 parents da057f0 + 8d25818
commit 49e040e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/layer5io/meshsync
 replace (
 	github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
 	github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f
-	github.com/layer5io/meshkit v0.2.12 => ../meshkit
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6
 	vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
 )

diff --git a/meshsync/exec.go b/meshsync/exec.go
@@ -133,6 +133,10 @@ func (h *Handler) streamSession(id string, req model.ExecRequest, cfg config.Lis
 	}()
 
 	for {
+		if _, ok := h.channelPool[id]; !ok {
+			h.Log.Info("Session closed for: ", id)
+			return
+		}
 		select {
 		case msg := <-subCh:
 			if msg.ObjectType == broker.ExecInputObject {