diff options
author | Francis Lavoie <lavofr@gmail.com> | 2022-04-28 12:16:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-28 12:16:25 -0400 |
commit | af7321511c960120d61cfd22e031f43071d5a9c2 (patch) | |
tree | f7206815dab06fb86b96ba9b0372d4c3aa303973 /caddyconfig/httpcaddyfile | |
parent | 0be3d995439245e8b4069fd3bddcd4b8ef9194d4 (diff) |
httpcaddyfile: Fix duplicate access log when debug is on (#4746)
Diffstat (limited to 'caddyconfig/httpcaddyfile')
-rw-r--r-- | caddyconfig/httpcaddyfile/httptype.go | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go index 5b0d845..242f0b8 100644 --- a/caddyconfig/httpcaddyfile/httptype.go +++ b/caddyconfig/httpcaddyfile/httptype.go @@ -254,20 +254,13 @@ func (st ServerType) Setup(inputServerBlocks []caddyfile.ServerBlock, } customLogs = append(customLogs, ncl) } + // Apply global log options, when set if options["log"] != nil { for _, logValue := range options["log"].([]ConfigValue) { addCustomLog(logValue.Value.(namedCustomLog)) } } - // Apply server-specific log options - for _, p := range pairings { - for _, sb := range p.serverBlocks { - for _, clVal := range sb.pile["custom_log"] { - addCustomLog(clVal.Value.(namedCustomLog)) - } - } - } if !hasDefaultLog { // if the default log was not customized, ensure we @@ -280,6 +273,15 @@ func (st ServerType) Setup(inputServerBlocks []caddyfile.ServerBlock, } } + // Apply server-specific log options + for _, p := range pairings { + for _, sb := range p.serverBlocks { + for _, clVal := range sb.pile["custom_log"] { + addCustomLog(clVal.Value.(namedCustomLog)) + } + } + } + // annnd the top-level config, then we're done! cfg := &caddy.Config{AppsRaw: make(caddy.ModuleMap)} |