Merge pull request #16286 from liggitt/wsstream_cpu

Avoid CPU hotloop on client-closed websocket

Merge pull request #16286 from liggitt/wsstream_cpu
fcd99461 · Daniel Smith · 37ee9584 · 85379b12 · fcd99461
Commit fcd99461 authored Oct 26, 2015 by Daniel Smith
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

conn.go pkg/util/wsstream/conn.go +1 -3

No files found.
--- a/pkg/util/wsstream/conn.go
+++ b/pkg/util/wsstream/conn.go
@@ -97,9 +97,7 @@ func ignoreReceives(ws *websocket.Conn, timeout time.Duration) {
 	for {
 		resetTimeout(ws, timeout)
 		if err := websocket.Message.Receive(ws, &data); err != nil {
-			if err == io.EOF {
+			return
-				return
-			}
 		}
 	}
 }