Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 13, 14:15 UTC
Minor style adjustments for HTTP redir logging
Matthew Holt committed
Sep 2, 2022 at 13:04 UTC
005c5a63823b19382aa918f1e1f3288e66446225
2 files changed
+13
-10
modules/caddyhttp/autohttps.go
+6
-4
@@ -93,8 +93,8 @@ func (app *App) automaticHTTPSPhase1(ctx caddy.Context, repl *caddy.Replacer) er
93
// https://github.com/caddyserver/caddy/issues/3443)
94
redirDomains := make(map[string][]caddy.NetworkAddress)
95
96
- // the configured logger for an HTTPS enabled server
97
- var logger *ServerLogConfig
96
+ // the log configuration for an HTTPS enabled server
97
+ var logCfg *ServerLogConfig
98
99
for srvName, srv := range app.Servers {
100
// as a prerequisite, provision route matchers; this is
@@ -176,8 +176,10 @@ func (app *App) automaticHTTPSPhase1(ctx caddy.Context, repl *caddy.Replacer) er
176
}
177
178
// clone the logger so we can apply it to the HTTP server
179
+ // (not sure if necessary to clone it; but probably safer)
180
+ // (we choose one log cfg arbitrarily; not sure which is best)
181
if srv.Logs != nil {
180
- logger = srv.Logs.clone()
182
+ logCfg = srv.Logs.clone()
183
}
184
185
// for all the hostnames we found, filter them so we have
@@ -408,7 +410,7 @@ redirServersLoop:
410
app.Servers["remaining_auto_https_redirects"] = &Server{
411
Listen: redirServerAddrsList,
412
Routes: appendCatchAll(redirRoutes),
411
- Logs: logger,
413
+ Logs: logCfg,
414
}
415
}
416
modules/caddyhttp/server.go
+7
-6
@@ -664,15 +664,16 @@ func (slc ServerLogConfig) getLoggerName(host string) string {
664
}
665
666
func (slc *ServerLogConfig) clone() *ServerLogConfig {
667
- clone := &ServerLogConfig{}
668
- clone.DefaultLoggerName = slc.DefaultLoggerName
669
- clone.LoggerNames = make(map[string]string)
667
+ clone := &ServerLogConfig{
668
+ DefaultLoggerName: slc.DefaultLoggerName,
669
+ LoggerNames: make(map[string]string),
670
+ SkipHosts: append([]string{}, slc.SkipHosts...),
671
+ SkipUnmappedHosts: slc.SkipUnmappedHosts,
672
+ ShouldLogCredentials: slc.ShouldLogCredentials,
673
+ }
674
for k, v := range slc.LoggerNames {
675
clone.LoggerNames[k] = v
676
}
673
- clone.SkipHosts = append(clone.SkipHosts, slc.SkipHosts...)
674
- clone.SkipUnmappedHosts = slc.SkipUnmappedHosts
675
- clone.ShouldLogCredentials = slc.ShouldLogCredentials
677
return clone
678
}
679