chore(deregister): tweak order the of deregister

kitex-contrib · Nov 17, 2023 · 8b07d34 · 8b07d34
1 parent f572399
commit 8b07d34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/client/circuit_breaker.go b/client/circuit_breaker.go
@@ -49,12 +49,12 @@ func WithCircuitBreaker(dest, src string, nacosClient nacos.Client, opts utils.O
 	return []client.Option{
 		client.WithCircuitBreaker(cbSuite),
 		client.WithCloseCallbacks(func() error {
-			err := cbSuite.Close()
+			err := nacosClient.DeregisterConfig(param, uniqueID)
 			if err != nil {
 				return err
 			}
 			// cancel the configuration listener when client is closed.
-			return nacosClient.DeregisterConfig(param, uniqueID)
+			return cbSuite.Close()
 		}),
 	}
 }

diff --git a/client/retry.go b/client/retry.go
@@ -47,7 +47,11 @@ func WithRetryPolicy(dest, src string, nacosClient nacos.Client, opts utils.Opti
 		client.WithCloseCallbacks(rc.Close),
 		client.WithCloseCallbacks(func() error {
 			// cancel the configuration listener when client is closed.
-			return nacosClient.DeregisterConfig(param, uniqueID)
+			err := nacosClient.DeregisterConfig(param, uniqueID)
+			if err != nil {
+				return err
+			}
+			return rc.Close()
 		}),
 	}
 }