github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-26 02:09:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

cmd: Fix defaulting admin address if empty in config, fixes reload (#4674)

Browse Source
This commit is contained in:
Francis Lavoie 2022-04-03 12:04:33 -04:00 committed by GitHub
parent 734acc776a
commit 22d8edb984
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/commandfuncs.go
View File

@ -735,7 +735,7 @@ func DetermineAdminAPIAddress(address, configFile, configAdapter string) (string
return "", fmt.Errorf("no config file to load") return "", fmt.Errorf("no config file to load")
} }
// get the address of the admin listener // get the address of the admin listener if set
if len(config) > 0 { if len(config) > 0 {
var tmpStruct struct { var tmpStruct struct {
Admin caddy.AdminConfig `json:"admin"` Admin caddy.AdminConfig `json:"admin"`
@ -744,9 +744,11 @@ func DetermineAdminAPIAddress(address, configFile, configAdapter string) (string
if err != nil { if err != nil {
return "", fmt.Errorf("unmarshaling admin listener address from config: %v", err) return "", fmt.Errorf("unmarshaling admin listener address from config: %v", err)
} }
if tmpStruct.Admin.Listen != "" {
return tmpStruct.Admin.Listen, nil return tmpStruct.Admin.Listen, nil
} }
} }
}
// Fallback to the default listen address otherwise // Fallback to the default listen address otherwise
return caddy.DefaultAdminListen, nil return caddy.DefaultAdminListen, nil