Merge remote-tracking branch 'origin/main'

openimsdk · Oct 27, 2023 · 485866f · 485866f
2 parents 9608e88 + ad22819
commit 485866f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/discoveryregistry/discovery_register.go b/discoveryregistry/discovery_register.go
@@ -37,4 +37,5 @@ type SvcDiscoveryRegistry interface {
 	CreateRpcRootNodes(serviceNames []string) error
 	RegisterConf2Registry(key string, conf []byte) error
 	GetConfFromRegistry(key string) ([]byte, error)
+	Close()
 }
diff --git a/discoveryregistry/zookeeper/zk.go b/discoveryregistry/zookeeper/zk.go
@@ -137,7 +137,7 @@ func NewClient(zkServers []string, zkRoot string, options ...ZkOption) (*ZkClien
 	client.eventChan = eventChan
 	client.conn = conn
 	if err := client.ensureRoot(); err != nil {
-		client.CloseZK()
+		client.Close()
 		return nil, err
 	}
 	resolver.Register(client)
@@ -147,7 +147,7 @@ func NewClient(zkServers []string, zkRoot string, options ...ZkOption) (*ZkClien
 	return client, nil
 }
 
-func (s *ZkClient) CloseZK() {
+func (s *ZkClient) Close() {
 	s.logger.Printf("close zk called")
 	s.cancel()
 	s.ticker.Stop()