From 0bb78cf76bbb93ca1494c8937f4bf8c250b738f7 Mon Sep 17 00:00:00 2001
From: smallteeths <503630985@qq.com>
Date: Tue, 29 Jun 2021 10:22:11 +0800
Subject: [PATCH] Don't cancel context of subscribe on method exit

---
 pkg/server/store/proxy/rbac_store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/server/store/proxy/rbac_store.go b/pkg/server/store/proxy/rbac_store.go
index 65ebfda2..2319865f 100644
--- a/pkg/server/store/proxy/rbac_store.go
+++ b/pkg/server/store/proxy/rbac_store.go
@@ -182,7 +182,6 @@ func (r *RBACStore) Watch(apiOp *types.APIRequest, schema *types.APISchema, w ty
 	}
 
 	ctx, cancel := context.WithCancel(apiOp.Context())
-	defer cancel()
 	apiOp = apiOp.WithContext(ctx)
 
 	eg := errgroup.Group{}
@@ -218,6 +217,7 @@ func (r *RBACStore) Watch(apiOp *types.APIRequest, schema *types.APISchema, w ty
 		defer close(response)
 		<-ctx.Done()
 		eg.Wait()
+		cancel()
 	}()
 
 	return response, nil