diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2019-10-31 11:45:18 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-10-31 11:45:18 -0600 |
| commit | fb06c041c4be4eb32f18d54e8e7feff8dd76b0e9 (patch) | |
| tree | b7b2a3d93ec55dfdcceb5e3ecc321f4a5055782f /modules/caddyhttp/server.go | |
| parent | 8ef0a0b4f8968fd1952449f9068e66486f40964c (diff) | |
http: Ensure server loggers are not nil (fixes #2849)
Diffstat (limited to 'modules/caddyhttp/server.go')
| -rw-r--r-- | modules/caddyhttp/server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go index 255b996..d01eaed 100644 --- a/modules/caddyhttp/server.go +++ b/modules/caddyhttp/server.go @@ -91,7 +91,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { zap.Object("request", loggableReq), ) - if s.Logs != nil { + if s.accessLogger != nil { wrec := NewResponseRecorder(w, nil, nil) w = wrec 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()) logger := accLog - if s.Logs.LoggerNames != nil { + if s.Logs != nil && s.Logs.LoggerNames != nil { logger = logger.Named(s.Logs.LoggerNames[r.Host]) } |