fix: prevents goroutine leak at websocket transport

99designs · May 14, 2022 · 3f7bf38 · 3f7bf38
1 parent b8ec51d
commit 3f7bf38
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/graphql/handler/transport/websocket.go b/graphql/handler/transport/websocket.go
@@ -371,12 +371,20 @@ func (c *wsConnection) subscribe(start time.Time, msg *message) {
 
 		responses, ctx := c.exec.DispatchOperation(ctx, rc)
 		for {
-			response := responses(ctx)
-			if response == nil {
-				break
-			}
+			// prevents goroutine leak
+			select {
+			case <-ctx.Done():
+				return
+			default:
+				{
+					response := responses(ctx)
+					if response == nil {
+						break
+					}
 
-			c.sendResponse(msg.id, response)
+					c.sendResponse(msg.id, response)
+				}
+			}
 		}
 
 		// complete and context cancel comes from the defer