From c712e08a42a59320f6287ad3ccbda3df4120f011 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Mon, 16 Apr 2018 04:01:05 -0700
Subject: [PATCH] embed,etcdmain: support structured logger

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 embed/config.go  | 2 +-
 embed/etcd.go    | 2 +-
 etcdmain/etcd.go | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/embed/config.go b/embed/config.go
index 55cee0846..f67dfa385 100644
--- a/embed/config.go
+++ b/embed/config.go
@@ -352,7 +352,6 @@ func (cfg Config) GetLogger() *zap.Logger {
 func (cfg *Config) setupLogging() error {
 	switch cfg.Logger {
 	case "capnslog": // TODO: deprecate this in v3.5
-		capnslog.SetGlobalLogLevel(capnslog.INFO)
 		cfg.ClientTLSInfo.HandshakeFailure = logTLSHandshakeFailure
 		cfg.PeerTLSInfo.HandshakeFailure = logTLSHandshakeFailure
 
@@ -362,6 +361,7 @@ func (cfg *Config) setupLogging() error {
 			// enable info, warning, error
 			grpclog.SetLoggerV2(grpclog.NewLoggerV2(os.Stderr, os.Stderr, os.Stderr))
 		} else {
+			capnslog.SetGlobalLogLevel(capnslog.INFO)
 			// only discard info
 			grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, os.Stderr, os.Stderr))
 		}
diff --git a/embed/etcd.go b/embed/etcd.go
index 723239f62..dace350f2 100644
--- a/embed/etcd.go
+++ b/embed/etcd.go
@@ -571,7 +571,7 @@ func (e *Etcd) serveClients() (err error) {
 	var h http.Handler
 	if e.Config().EnableV2 {
 		if len(e.Config().ExperimentalEnableV2V3) > 0 {
-			srv := v2v3.NewServer(v3client.New(e.Server), e.cfg.ExperimentalEnableV2V3)
+			srv := v2v3.NewServer(e.cfg.logger, v3client.New(e.Server), e.cfg.ExperimentalEnableV2V3)
 			h = v2http.NewClientHandler(srv, e.Server.Cfg.ReqTimeout())
 		} else {
 			h = v2http.NewClientHandler(e.Server, e.Server.Cfg.ReqTimeout())
diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
index e19949177..9c3471e85 100644
--- a/etcdmain/etcd.go
+++ b/etcdmain/etcd.go
@@ -259,7 +259,7 @@ func startEtcdOrProxyV2() {
 		}
 	}
 
-	osutil.HandleInterrupts()
+	osutil.HandleInterrupts(lg)
 
 	// At this point, the initialization of etcd is done.
 	// The listeners are listening on the TCP ports and ready
@@ -408,7 +408,7 @@ func startProxy(cfg *config) error {
 
 	clientURLs := []string{}
 	uf := func() []string {
-		gcls, gerr := etcdserver.GetClusterFromRemotePeers(peerURLs, tr)
+		gcls, gerr := etcdserver.GetClusterFromRemotePeers(lg, peerURLs, tr)
 		if gerr != nil {
 			if lg != nil {
 				lg.Warn(