From 60afea092b2e5daec4798c51847db05430a845ed Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 29 Jun 2023 23:15:10 +0800 Subject: [PATCH] ctx --- pkg/common/mw/rpc_client_interceptor.go | 3 +-- pkg/discoveryregistry/zookeeper/resolver.go | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/common/mw/rpc_client_interceptor.go b/pkg/common/mw/rpc_client_interceptor.go index 2ac627e79..e52366ec0 100644 --- a/pkg/common/mw/rpc_client_interceptor.go +++ b/pkg/common/mw/rpc_client_interceptor.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "strings" - "time" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" @@ -54,7 +53,7 @@ func RpcClientInterceptor(ctx context.Context, method string, req, resp interfac } func getRpcContext(ctx context.Context, method string) (context.Context, error) { - ctx, _ = context.WithTimeout(ctx, time.Second*5) + // ctx, _ = context.WithTimeout(ctx, time.Second*5) md := metadata.Pairs() if keys, _ := ctx.Value(constant.RpcCustomHeader).([]string); len(keys) > 0 { for _, key := range keys { diff --git a/pkg/discoveryregistry/zookeeper/resolver.go b/pkg/discoveryregistry/zookeeper/resolver.go index 57e0f5db7..ea1e13dfc 100644 --- a/pkg/discoveryregistry/zookeeper/resolver.go +++ b/pkg/discoveryregistry/zookeeper/resolver.go @@ -25,10 +25,6 @@ func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) { return } r.addrs = newConns - if len(newConns) == 0 { - log.ZError(context.Background(), "conn is nil", nil) - return - } if err := r.cc.UpdateState(resolver.State{Addresses: newConns}); err != nil { log.ZError(context.Background(), "UpdateState error, conns is nil from svr", err, "conns", newConns, "zk path", r.target.URL.Path) return