Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12948 from serathius/logger

Browse Source 
client: Allow setting zap logger in config
This commit is contained in:
Piotr Tabor
2021-05-12 13:49:48 +02:00
committed by GitHub
parent e0a8484c8f 06afe87b34
commit 1929aa0a36
11 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/etcdmain/grpc_proxy.go
View File

@@ -283,17 +283,18 @@ func mustNewClient(lg *zap.Logger) *clientv3.Client {
grpc.WithUnaryInterceptor(grpcproxy.AuthUnaryClientInterceptor))
cfg.DialOptions = append(cfg.DialOptions,
grpc.WithStreamInterceptor(grpcproxy.AuthStreamClientInterceptor))
cfg.Logger = lg.Named("client")
client, err := clientv3.New(*cfg)
if err != nil {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
return client.WithLogger(lg.Named("client"))
return client
}
func mustNewProxyClient(lg *zap.Logger, tls *transport.TLSInfo) *clientv3.Client {
eps := []string{grpcProxyAdvertiseClientURL}
cfg, err := newProxyClientCfg(lg, eps, tls)
cfg, err := newProxyClientCfg(lg.Named("client"), eps, tls)
if err != nil {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
@@ -304,13 +305,14 @@ func mustNewProxyClient(lg *zap.Logger, tls *transport.TLSInfo) *clientv3.Client
os.Exit(1)
}
lg.Info("create proxy client", zap.String("grpcProxyAdvertiseClientURL", grpcProxyAdvertiseClientURL))
return client.WithLogger(lg.Named("client"))
return client
}
func newProxyClientCfg(lg *zap.Logger, eps []string, tls *transport.TLSInfo) (*clientv3.Config, error) {
cfg := clientv3.Config{
Endpoints: eps,
DialTimeout: 5 * time.Second,
Logger: lg,
}
if tls != nil {
clientTLS, err := tls.ClientConfig()