github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-25 20:29:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

admin,templates,core: Minor enhancements and error handling (#3607)

Browse Source 
* fix 2 possible bugs

* handle unhandled errors
This commit is contained in:
Bart
2020-07-31 22:54:18 +00:00
committed by GitHub
parent 514eef33fe
commit af5c148ed1
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
admin.go
View File

@ -18,6 +18,7 @@ import (
"bytes"
"context"
"encoding/json"
"errors"
"expvar"
"fmt"
"io"
@ -235,15 +236,20 @@ func replaceAdmin(cfg *Config) error {
MaxHeaderBytes: 1024 * 64,
}
go adminServer.Serve(ln)
adminLogger := Log().Named("admin")
go func() {
if err := adminServer.Serve(ln); !errors.Is(err, http.ErrServerClosed) {
adminLogger.Error("admin server shutdown for unknown reason", zap.Error(err))
}
}()
Log().Named("admin").Info("admin endpoint started",
adminLogger.Info("admin endpoint started",
zap.String("address", addr.String()),
zap.Bool("enforce_origin", adminConfig.EnforceOrigin),
zap.Strings("origins", handler.allowedOrigins))
if !handler.enforceHost {
Log().Named("admin").Warn("admin endpoint on open interface; host checking disabled",
adminLogger.Warn("admin endpoint on open interface; host checking disabled",
zap.String("address", addr.String()))
}