stop reconnecting websocket connection after the context was canceled

hasura · Feb 10, 2025 · cf325bd · cf325bd
1 parent 690fee7
commit cf325bd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/example/hasura/docker-compose.yaml b/example/hasura/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
       POSTGRES_PASSWORD: postgrespassword
 
   hasura:
-    image: hasura/graphql-engine:v2.16.1.cli-migrations-v3
+    image: hasura/graphql-engine:v2.45.1.cli-migrations-v3
     depends_on:
       - "postgres"
     ports:

diff --git a/subscription.go b/subscription.go
@@ -399,13 +399,17 @@ func (sc *SubscriptionContext) init(parentContext context.Context) error {
 				sc.cancel = cancel
 
 				return nil
-			} else {
-				_ = conn.Close()
 			}
+
+			_ = conn.Close()
 		}
 
 		cancel()
 
+		if errors.Is(err, context.Canceled) {
+			return err
+		}
+
 		if sc.client.retryTimeout > 0 && now.Add(sc.client.retryTimeout).Before(time.Now()) {
 			sc.OnDisconnected()
 
@@ -1094,6 +1098,10 @@ func (sc *SubscriptionClient) RunWithContext(ctx context.Context) error {
 			// the client also automatically retries the connection.
 			subContext, err := sc.initNewSession(ctx)
 			if err != nil {
+				if errors.Is(err, context.Canceled) {
+					return nil
+				}
+
 				return err
 			}