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 #17270 from ahrtr/nil_log_20240118

Browse Source 
[3.4] Use the correct log library to print log messages to prevent nil pointer panicking
This commit is contained in:
Benjamin Wang 2024-01-18 18:03:02 +00:00 committed by GitHub
commit d441d74c0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
embed/serve.go
View File

@ -96,7 +96,9 @@ func (sctx *serveCtx) serve(
logger := defaultLog.New(ioutil.Discard, "etcdhttp", 0)
<-s.ReadyNotify()
if sctx.lg == nil {
if sctx.lg != nil {
sctx.lg.Info("ready to serve client requests")
} else {
plog.Info("ready to serve client requests")
}
@ -118,7 +120,11 @@ func (sctx *serveCtx) serve(
// GRPC gateway connects to grpc server via connection provided by grpc dial.
gwmux, err = sctx.registerGateway(grpcDialForRestGatewayBackends)
if err != nil {
sctx.lg.Error("registerGateway failed", zap.Error(err))
if sctx.lg != nil {
sctx.lg.Error("registerGateway failed", zap.Error(err))
} else {
plog.Errorf("registerGateway failed: %v", err)
}
return err
}
}
@ -142,7 +148,12 @@ func (sctx *serveCtx) serve(
ErrorLog: logger, // do not log user error
}
if err := configureHttpServer(srv, s.Cfg); err != nil {
sctx.lg.Error("Configure http server failed", zap.Error(err))
if sctx.lg != nil {
sctx.lg.Error("Configure http server failed", zap.Error(err))
} else {
plog.Errorf("Configure http server failed: %v", err)
}
return err
}
}
@ -253,7 +264,11 @@ func (sctx *serveCtx) serve(
ErrorLog: logger, // do not log user error
}
if err := configureHttpServer(srv, s.Cfg); err != nil {
sctx.lg.Error("Configure https server failed", zap.Error(err))
if sctx.lg != nil {
sctx.lg.Error("Configure https server failed", zap.Error(err))
} else {
plog.Errorf("Configure https server failed: %v", err)
}
return err
}
}