bigger lock area to try to affect deadlock

Author: HaraldNordgren

graphql/subscription.go

@@ -48,8 +48,6 @@ func (s *subscriptionMap) Unsubscribe(subscriptionID string) error {
 }
 
 func (s *subscriptionMap) GetAllIDs() (subscriptionIDs []string) {
-	s.RLock()
-	defer s.RUnlock()
 	for subID := range s.map_ {
 		subscriptionIDs = append(subscriptionIDs, subID)
 	}

graphql/websocket.go

@@ -196,6 +196,9 @@ func (w *webSocketClient) Start(ctx context.Context) (errChan chan error, err er
 }
 
 func (w *webSocketClient) Close() error {
+	w.Lock()
+	defer w.Unlock()
+	w.isClosing.Store(true)
 	if w.conn == nil {
 		return nil
 	}
@@ -207,9 +210,6 @@ func (w *webSocketClient) Close() error {
 	if err != nil {
 		return fmt.Errorf("failed to send closure message: %w", err)
 	}
-	w.Lock()
-	defer w.Unlock()
-	w.isClosing.Store(true)
 	close(w.errChan)
 	return w.conn.Close()
 }