github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 10:14:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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))
defer cancel()
}
for _, s := range app.servers {
err := s.Shutdown(ctx)
if err != nil {
return err
for i, s := range app.servers {
if err := s.Shutdown(ctx); err != nil {
app.logger.Error("server shutdown",
zap.Error(err),
zap.Int("index", i))
}
}
for _, s := range app.h3servers {
for i, s := range app.h3servers {
// TODO: CloseGracefully, once implemented upstream
// (see https://github.com/lucas-clemente/quic-go/issues/2103)
err := s.Close()
if err != nil {
return err
if err := s.Close(); err != nil {
app.logger.Error("HTTP/3 server shutdown",
zap.Error(err),
zap.Int("index", i))
}
}
return nil