From f7f6fdeb5284915252631657a92353dc4e616439 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Thu, 26 Apr 2018 14:22:09 -0700 Subject: [PATCH] etcdserver: support structured logger for discovery, compactor Signed-off-by: Gyuho Lee --- etcdserver/server.go | 4 ++-- etcdserver/v2auth/auth.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etcdserver/server.go b/etcdserver/server.go index 987eeb7f7..8270faca5 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -369,7 +369,7 @@ func NewServer(cfg ServerConfig) (srv *EtcdServer, err error) { } if cfg.ShouldDiscover() { var str string - str, err = discovery.JoinCluster(cfg.DiscoveryURL, cfg.DiscoveryProxy, m.ID, cfg.InitialPeerURLsMap.String()) + str, err = discovery.JoinCluster(cfg.Logger, cfg.DiscoveryURL, cfg.DiscoveryProxy, m.ID, cfg.InitialPeerURLsMap.String()) if err != nil { return nil, &DiscoveryError{Op: "join", Err: err} } @@ -562,7 +562,7 @@ func NewServer(cfg ServerConfig) (srv *EtcdServer, err error) { } srv.authStore = auth.NewAuthStore(srv.be, tp) if num := cfg.AutoCompactionRetention; num != 0 { - srv.compactor, err = compactor.New(cfg.AutoCompactionMode, num, srv.kv, srv) + srv.compactor, err = compactor.New(cfg.Logger, cfg.AutoCompactionMode, num, srv.kv, srv) if err != nil { return nil, err } diff --git a/etcdserver/v2auth/auth.go b/etcdserver/v2auth/auth.go index ba34336db..fe9d228f8 100644 --- a/etcdserver/v2auth/auth.go +++ b/etcdserver/v2auth/auth.go @@ -30,8 +30,8 @@ import ( "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/v2error" "github.com/coreos/etcd/pkg/types" - "github.com/coreos/pkg/capnslog" + "github.com/coreos/pkg/capnslog" "golang.org/x/crypto/bcrypt" )