From d062fb40201b321c492da9b50ab8d107e0bb3c5f Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Thu, 1 Sep 2022 23:31:54 -0400 Subject: caddyhttp: Copy logger config to HTTP server during AutoHTTPS (#4990) --- modules/caddyhttp/server.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'modules/caddyhttp/server.go') diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go index e01e7c8..2dabf46 100644 --- a/modules/caddyhttp/server.go +++ b/modules/caddyhttp/server.go @@ -663,6 +663,19 @@ func (slc ServerLogConfig) getLoggerName(host string) string { return slc.DefaultLoggerName } +func (slc *ServerLogConfig) clone() *ServerLogConfig { + clone := &ServerLogConfig{} + clone.DefaultLoggerName = slc.DefaultLoggerName + clone.LoggerNames = make(map[string]string) + for k, v := range slc.LoggerNames { + clone.LoggerNames[k] = v + } + clone.SkipHosts = append(clone.SkipHosts, slc.SkipHosts...) + clone.SkipUnmappedHosts = slc.SkipUnmappedHosts + clone.ShouldLogCredentials = slc.ShouldLogCredentials + return clone +} + // PrepareRequest fills the request r for use in a Caddy HTTP handler chain. w and s can // be nil, but the handlers will lose response placeholders and access to the server. func PrepareRequest(r *http.Request, repl *caddy.Replacer, w http.ResponseWriter, s *Server) *http.Request { -- cgit v1.2.3