github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 19:33:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor style adjustments for HTTP redir logging

Browse Source
This commit is contained in:
Matthew Holt 2022-09-02 13:04:31 -06:00
parent 6c0d0511ba
commit 005c5a6382
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/caddyhttp/autohttps.go
View File

@ -93,8 +93,8 @@ func (app *App) automaticHTTPSPhase1(ctx caddy.Context, repl *caddy.Replacer) er
// https://github.com/caddyserver/caddy/issues/3443)
redirDomains := make(map[string][]caddy.NetworkAddress)
// the configured logger for an HTTPS enabled server
var logger *ServerLogConfig
// the log configuration for an HTTPS enabled server
var logCfg *ServerLogConfig
for srvName, srv := range app.Servers {
// as a prerequisite, provision route matchers; this is
@ -176,8 +176,10 @@ func (app *App) automaticHTTPSPhase1(ctx caddy.Context, repl *caddy.Replacer) er
}
// clone the logger so we can apply it to the HTTP server
// (not sure if necessary to clone it; but probably safer)
// (we choose one log cfg arbitrarily; not sure which is best)
if srv.Logs != nil {
logger = srv.Logs.clone()
logCfg = srv.Logs.clone()
}
// for all the hostnames we found, filter them so we have
@ -408,7 +410,7 @@ redirServersLoop:
app.Servers["remaining_auto_https_redirects"] = &Server{
Listen: redirServerAddrsList,
Routes: appendCatchAll(redirRoutes),
Logs: logger,
Logs: logCfg,
}
}

13
modules/caddyhttp/server.go
View File

@ -664,15 +664,16 @@ func (slc ServerLogConfig) getLoggerName(host string) string {
}
func (slc *ServerLogConfig) clone() *ServerLogConfig {
clone := &ServerLogConfig{}
clone.DefaultLoggerName = slc.DefaultLoggerName
clone.LoggerNames = make(map[string]string)
clone := &ServerLogConfig{
DefaultLoggerName: slc.DefaultLoggerName,
LoggerNames: make(map[string]string),
SkipHosts: append([]string{}, slc.SkipHosts...),
SkipUnmappedHosts: slc.SkipUnmappedHosts,
ShouldLogCredentials: slc.ShouldLogCredentials,
}
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
}