attempt to break deadlock

Author: HaraldNordgren

graphql/websocket.go

@@ -130,28 +130,41 @@ func (w *webSocketClient) listenWebSocket() {
 	}
 }
 
-func (w *webSocketClient) forwardWebSocketData(message []byte) error {
-	var wsMsg webSocketReceiveMessage
-	err := json.Unmarshal(message, &wsMsg)
-	if err != nil {
-		return err
-	}
-	if wsMsg.ID == "" { // e.g. keep-alive messages
-		return nil
-	}
+func (w *webSocketClient) getSubAndHandleCompletion(wsMsg webSocketReceiveMessage) (*subscription, error) {
 	w.subscriptions.Lock()
 	defer w.subscriptions.Unlock()
 	sub, success := w.subscriptions.map_[wsMsg.ID]
 	if !success {
-		return fmt.Errorf("received message for unknown subscription ID '%s'", wsMsg.ID)
+		return nil, fmt.Errorf("received message for unknown subscription ID '%s'", wsMsg.ID)
 	}
 	if sub.hasBeenUnsubscribed {
-		return nil
+		return nil, nil
 	}
 	if wsMsg.Type == webSocketTypeComplete {
 		sub.hasBeenUnsubscribed = true
 		w.subscriptions.map_[wsMsg.ID] = sub
 		reflect.ValueOf(sub.interfaceChan).Close()
+		return nil, nil
+	}
+
+	return &sub, nil
+}
+
+func (w *webSocketClient) forwardWebSocketData(message []byte) error {
+	var wsMsg webSocketReceiveMessage
+	err := json.Unmarshal(message, &wsMsg)
+	if err != nil {
+		return err
+	}
+	if wsMsg.ID == "" { // e.g. keep-alive messages
+		return nil
+	}
+
+	sub, err := w.getSubAndHandleCompletion(wsMsg)
+	if err != nil {
+		return err
+	}
+	if sub == nil {
 		return nil
 	}