serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-14 14:56:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

caddyhttp: Log shutdown errors, don't return (fix #4908)

Browse source
This commit is contained in:
Matthew Holt 2022-07-25 10:39:59 -06:00
parent a379fa4c6c
commit 0bebea0d4c
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/caddyhttp/app.go
View file

@ -415,19 +415,21 @@ func (app *App) Stop() error {
ctx, cancel = context.WithTimeout(ctx, time.Duration(app.GracePeriod)) ctx, cancel = context.WithTimeout(ctx, time.Duration(app.GracePeriod))
defer cancel() defer cancel()
} }
for _, s := range app.servers { for i, s := range app.servers {
err := s.Shutdown(ctx) if err := s.Shutdown(ctx); err != nil {
if err != nil { app.logger.Error("server shutdown",
return err zap.Error(err),
zap.Int("index", i))
} }
} }
for _, s := range app.h3servers { for i, s := range app.h3servers {
// TODO: CloseGracefully, once implemented upstream // TODO: CloseGracefully, once implemented upstream
// (see https://github.com/lucas-clemente/quic-go/issues/2103) // (see https://github.com/lucas-clemente/quic-go/issues/2103)
err := s.Close() if err := s.Close(); err != nil {
if err != nil { app.logger.Error("HTTP/3 server shutdown",
return err zap.Error(err),
zap.Int("index", i))
} }
} }
return nil return nil