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

embed,etcdmain: support structured logger

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-16 04:01:05 -07:00
parent a7fd274c11
commit c712e08a42
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embed/config.go
View File

@ -352,7 +352,6 @@ func (cfg Config) GetLogger() *zap.Logger {
func (cfg *Config) setupLogging() error { func (cfg *Config) setupLogging() error {
switch cfg.Logger { switch cfg.Logger {
case "capnslog": // TODO: deprecate this in v3.5 case "capnslog": // TODO: deprecate this in v3.5
capnslog.SetGlobalLogLevel(capnslog.INFO)
cfg.ClientTLSInfo.HandshakeFailure = logTLSHandshakeFailure cfg.ClientTLSInfo.HandshakeFailure = logTLSHandshakeFailure
cfg.PeerTLSInfo.HandshakeFailure = logTLSHandshakeFailure cfg.PeerTLSInfo.HandshakeFailure = logTLSHandshakeFailure
@ -362,6 +361,7 @@ func (cfg *Config) setupLogging() error {
// enable info, warning, error // enable info, warning, error
grpclog.SetLoggerV2(grpclog.NewLoggerV2(os.Stderr, os.Stderr, os.Stderr)) grpclog.SetLoggerV2(grpclog.NewLoggerV2(os.Stderr, os.Stderr, os.Stderr))
} else { } else {
capnslog.SetGlobalLogLevel(capnslog.INFO)
// only discard info // only discard info
grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, os.Stderr, os.Stderr)) grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, os.Stderr, os.Stderr))
} }

2
embed/etcd.go
View File

@ -571,7 +571,7 @@ func (e *Etcd) serveClients() (err error) {
var h http.Handler var h http.Handler
if e.Config().EnableV2 { if e.Config().EnableV2 {
if len(e.Config().ExperimentalEnableV2V3) > 0 { 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()) h = v2http.NewClientHandler(srv, e.Server.Cfg.ReqTimeout())
} else { } else {
h = v2http.NewClientHandler(e.Server, e.Server.Cfg.ReqTimeout()) h = v2http.NewClientHandler(e.Server, e.Server.Cfg.ReqTimeout())

4
etcdmain/etcd.go
View File

@ -259,7 +259,7 @@ func startEtcdOrProxyV2() {
} }
} }
osutil.HandleInterrupts() osutil.HandleInterrupts(lg)
// At this point, the initialization of etcd is done. // At this point, the initialization of etcd is done.
// The listeners are listening on the TCP ports and ready // The listeners are listening on the TCP ports and ready
@ -408,7 +408,7 @@ func startProxy(cfg *config) error {
clientURLs := []string{} clientURLs := []string{}
uf := func() []string { uf := func() []string {
gcls, gerr := etcdserver.GetClusterFromRemotePeers(peerURLs, tr) gcls, gerr := etcdserver.GetClusterFromRemotePeers(lg, peerURLs, tr)
if gerr != nil { if gerr != nil {
if lg != nil { if lg != nil {
lg.Warn( lg.Warn(