fix: no direct import go.uber.org/zap

zeromicro · May 12, 2023 · 89b3996 · 89b3996
1 parent 34f01c6
commit 89b3996
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/core/discov/internal/registry.go b/core/discov/internal/registry.go
@@ -342,7 +342,9 @@ func DialClient(endpoints []string) (EtcdClient, error) {
 		DialTimeout:         DialTimeout,
 		RejectOldCluster:    true,
 		PermitWithoutStream: true,
-		Logger:              logx.DefaultZapLogger,
+	}
+	if logx.DefaultZapLogger != nil && logx.DefaultZapLogger.Logger != nil {
+		cfg.Logger = logx.DefaultZapLogger.Logger
 	}
 	if account, ok := GetAccount(endpoints); ok {
 		cfg.Username = account.User

diff --git a/core/logx/overwrite.go b/core/logx/overwrite.go
@@ -1,7 +1,10 @@
 package logx
 
-import "go.uber.org/zap"
+import (
+	clientv3 "go.etcd.io/etcd/client/v3"
+)
 
 var (
-	DefaultZapLogger *zap.Logger = nil
+	// DefaultZapLogger must be initialize before zrpc.MustNewServer
+	DefaultZapLogger *clientv3.Config = nil
 )