mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-05-05 01:25:58 +08:00
style: add format
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
This commit is contained in:
@@ -6,9 +6,10 @@ import (
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
|
||||
|
||||
"github.com/go-zookeeper/zk"
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/resolver"
|
||||
@@ -68,7 +69,11 @@ func (s *ZkClient) GetConnsRemote(serviceName string) (conns []resolver.Address,
|
||||
return conns, nil
|
||||
}
|
||||
|
||||
func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]grpc.ClientConnInterface, error) {
|
||||
func (s *ZkClient) GetConns(
|
||||
ctx context.Context,
|
||||
serviceName string,
|
||||
opts ...grpc.DialOption,
|
||||
) ([]grpc.ClientConnInterface, error) {
|
||||
s.logger.Printf("get conns from client, serviceName: %s", serviceName)
|
||||
s.lock.Lock()
|
||||
opts = append(s.options, opts...)
|
||||
@@ -82,7 +87,13 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp
|
||||
return nil, err
|
||||
}
|
||||
if len(conns) == 0 {
|
||||
return nil, fmt.Errorf("no conn for service %s, grpc server may not exist, local conn is %v, please check zookeeper server %v, path: %s", serviceName, s.localConns, s.zkServers, s.zkRoot)
|
||||
return nil, fmt.Errorf(
|
||||
"no conn for service %s, grpc server may not exist, local conn is %v, please check zookeeper server %v, path: %s",
|
||||
serviceName,
|
||||
s.localConns,
|
||||
s.zkServers,
|
||||
s.zkRoot,
|
||||
)
|
||||
}
|
||||
s.localConns[serviceName] = conns
|
||||
}
|
||||
@@ -100,8 +111,15 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (grpc.ClientConnInterface, error) {
|
||||
newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName)))
|
||||
func (s *ZkClient) GetConn(
|
||||
ctx context.Context,
|
||||
serviceName string,
|
||||
opts ...grpc.DialOption,
|
||||
) (grpc.ClientConnInterface, error) {
|
||||
newOpts := append(
|
||||
s.options,
|
||||
grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName)),
|
||||
)
|
||||
s.logger.Printf("get conn from client, serviceName: %s", serviceName)
|
||||
return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...)
|
||||
}
|
||||
|
||||
@@ -26,7 +26,11 @@ func (s *ZkClient) Register(rpcRegisterName, host string, port int, opts ...grpc
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
node, err := s.conn.CreateProtectedEphemeralSequential(s.getPath(rpcRegisterName)+"/"+addr+"_", []byte(addr), zk.WorldACL(zk.PermAll))
|
||||
node, err := s.conn.CreateProtectedEphemeralSequential(
|
||||
s.getPath(rpcRegisterName)+"/"+addr+"_",
|
||||
[]byte(addr),
|
||||
zk.WorldACL(zk.PermAll),
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -18,7 +18,16 @@ type Resolver struct {
|
||||
}
|
||||
|
||||
func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) {
|
||||
log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc.UpdateState, "serviceName", strings.TrimLeft(r.target.URL.Path, "/"))
|
||||
log.ZDebug(
|
||||
context.Background(),
|
||||
"start resolve now",
|
||||
"target",
|
||||
r.target,
|
||||
"cc",
|
||||
r.cc.UpdateState,
|
||||
"serviceName",
|
||||
strings.TrimLeft(r.target.URL.Path, "/"),
|
||||
)
|
||||
newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/"))
|
||||
if err != nil {
|
||||
log.ZError(context.Background(), "resolve now error", err, "target", r.target)
|
||||
@@ -26,7 +35,15 @@ func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) {
|
||||
}
|
||||
r.addrs = newConns
|
||||
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)
|
||||
log.ZError(
|
||||
context.Background(),
|
||||
"UpdateState error, conns is nil from svr",
|
||||
err,
|
||||
"conns",
|
||||
newConns,
|
||||
"zk path",
|
||||
r.target.URL.Path,
|
||||
)
|
||||
return
|
||||
}
|
||||
log.ZDebug(context.Background(), "resolve now finished", "target", r.target, "conns", r.addrs)
|
||||
@@ -36,7 +53,11 @@ func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {}
|
||||
|
||||
func (s *Resolver) Close() {}
|
||||
|
||||
func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
|
||||
func (s *ZkClient) Build(
|
||||
target resolver.Target,
|
||||
cc resolver.ClientConn,
|
||||
opts resolver.BuildOptions,
|
||||
) (resolver.Resolver, error) {
|
||||
s.logger.Printf("build resolver: %+v, cc: %+v", target, cc.UpdateState)
|
||||
// log.ZDebug(context.Background(), "build resolver start", "target", target, "cc", cc.UpdateState)
|
||||
r := &Resolver{}
|
||||
@@ -49,7 +70,8 @@ func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts re
|
||||
serviceName := strings.TrimLeft(target.URL.Path, "/")
|
||||
s.resolvers[serviceName] = r
|
||||
s.logger.Printf("build resolver finished: %+v, cc: %+v, key: %s", target, cc.UpdateState, serviceName)
|
||||
// log.ZDebug(context.Background(), "build resolver finished", "target", target, "cc", cc.UpdateState, "serviceName", serviceName)
|
||||
// log.ZDebug(context.Background(), "build resolver finished", "target", target, "cc", cc.UpdateState,
|
||||
// "serviceName", serviceName)
|
||||
return r, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -97,7 +97,12 @@ func NewClient(zkServers []string, zkRoot string, options ...ZkOption) (*ZkClien
|
||||
for _, option := range options {
|
||||
option(client)
|
||||
}
|
||||
conn, eventChan, err := zk.Connect(zkServers, time.Duration(client.timeout)*time.Second, zk.WithLogInfo(true), zk.WithLogger(client.logger))
|
||||
conn, eventChan, err := zk.Connect(
|
||||
zkServers,
|
||||
time.Duration(client.timeout)*time.Second,
|
||||
zk.WithLogInfo(true),
|
||||
zk.WithLogger(client.logger),
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user