serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 06:03:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

http: Ensure server loggers are not nil (fixes #2849)

Browse source
This commit is contained in:
Matthew Holt 2019-10-31 11:45:18 -06:00
parent 8ef0a0b4f8
commit fb06c041c4
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/caddyhttp/caddyhttp.go
View file

@ -479,9 +479,11 @@ func (app *App) automaticHTTPS() error {
// rest of the redirects // rest of the redirects
if len(redirServerAddrs) > 0 { if len(redirServerAddrs) > 0 {
app.Servers["remaining_auto_https_redirects"] = &Server{ app.Servers["remaining_auto_https_redirects"] = &Server{
Listen: redirServerAddrs, Listen: redirServerAddrs,
Routes: redirRoutes, Routes: redirRoutes,
tlsApp: tlsApp, // required to solve HTTP challenge tlsApp: tlsApp, // required to solve HTTP challenge
logger: app.logger.Named("log"),
errorLogger: app.logger.Named("log.error"),
} }
} }
} }

4
modules/caddyhttp/server.go
View file

@ -91,7 +91,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
zap.Object("request", loggableReq), zap.Object("request", loggableReq),
) )
if s.Logs != nil { if s.accessLogger != nil {
wrec := NewResponseRecorder(w, nil, nil) wrec := NewResponseRecorder(w, nil, nil)
w = wrec w = wrec
accLog := s.accessLogger.With( accLog := s.accessLogger.With(
@ -107,7 +107,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
repl.Set("http.response.latency", latency.String()) repl.Set("http.response.latency", latency.String())
logger := accLog logger := accLog
if s.Logs.LoggerNames != nil { if s.Logs != nil && s.Logs.LoggerNames != nil {
logger = logger.Named(s.Logs.LoggerNames[r.Host]) logger = logger.Named(s.Logs.LoggerNames[r.Host])
} }