serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-13 22:36:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

httpcaddyfile: Yield cleaner JSON when conn policy or log name is empty

Browse source
This commit is contained in:
Matthew Holt 2020-04-03 20:19:46 -06:00
parent c7ac7de38a
commit 3d6fc1e1b7
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
caddyconfig/httpcaddyfile/httptype.go
View file

@ -449,7 +449,9 @@ func (st *ServerType) serversFromPairings(
}
}
for _, h := range sblock.hostsFromKeys(true, true) {
srv.Logs.LoggerNames[h] = ncl.name
if ncl.name != "" {
srv.Logs.LoggerNames[h] = ncl.name
}
}
}
}
@ -548,10 +550,22 @@ func detectConflictingSchemes(srv *caddyhttp.Server, serverBlocks []serverBlock,
return nil
}
// consolidateConnPolicies combines TLS connection policies that are the same,
// for a cleaner overall output.
// consolidateConnPolicies removes empty TLS connection policies and combines
// equivalent ones for a cleaner overall output.
func consolidateConnPolicies(cps caddytls.ConnectionPolicies) (caddytls.ConnectionPolicies, error) {
empty := new(caddytls.ConnectionPolicy)
for i := 0; i < len(cps); i++ {
// if the connection policy is empty or has
// only matchers, we can remove it entirely
empty.MatchersRaw = cps[i].MatchersRaw
if reflect.DeepEqual(empty, cps[i]) {
cps = append(cps[:i], cps[i+1:]...)
i--
continue
}
// compare it to the others
for j := 0; j < len(cps); j++ {
if j == i {
continue