Matthew Holt
5 years ago
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with
7 additions and
5 deletions
-
modules/caddyhttp/caddyhttp.go
-
modules/caddyhttp/server.go
|
|
@ -479,9 +479,11 @@ func (app *App) automaticHTTPS() error { |
|
|
|
// rest of the redirects
|
|
|
|
if len(redirServerAddrs) > 0 { |
|
|
|
app.Servers["remaining_auto_https_redirects"] = &Server{ |
|
|
|
Listen: redirServerAddrs, |
|
|
|
Routes: redirRoutes, |
|
|
|
tlsApp: tlsApp, // required to solve HTTP challenge
|
|
|
|
Listen: redirServerAddrs, |
|
|
|
Routes: redirRoutes, |
|
|
|
tlsApp: tlsApp, // required to solve HTTP challenge
|
|
|
|
logger: app.logger.Named("log"), |
|
|
|
errorLogger: app.logger.Named("log.error"), |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
@ -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]) |
|
|
|
} |
|
|
|
|
|
|
|