Skip to content

[3.4] Use the correct log library to print log messages to prevent nil pointer panicking #17270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahrtr merged 1 commit into from
Jan 18, 2024
Merged

[3.4] Use the correct log library to print log messages to prevent nil pointer panicking #17270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions embed/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand All @@ -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
}
}
Expand All @@ -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
}
}
Expand Down Expand Up @@ -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
}
}
Expand Down