Merge pull request #1380 from stefanor/stderr-websocket-pings

exec: Consume websocket pings for stderr
lxc · Nov 16, 2024 · ce639bb · ce639bb
2 parents 795717f + d098f46
commit ce639bb
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/cmd/incusd/instance_exec.go b/cmd/incusd/instance_exec.go
@@ -478,6 +478,15 @@ func (s *execWs) Do(op *operations.Operation) error {
 					}()
 				}
 
+				if i == execWSStderr {
+					// Consume data (e.g. websocket pings) from stderr too to
+					// avoid a situation where we hit an inactivity timeout on
+					// stderr during long exec sessions
+					go func() {
+						_, _, _ = conn.ReadMessage()
+					}()
+				}
+
 				if i == execWSStdin {
 					err = <-ws.MirrorWrite(conn, ttys[i])
 					_ = ttys[i].Close()