diff options
author | Francis Lavoie <lavofr@gmail.com> | 2022-04-03 12:04:33 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-03 12:04:33 -0400 |
commit | 22d8edb984b9a0cbe5d205f823b455920464bb95 (patch) | |
tree | 17e0823c7dfcb14850723ce47652265b0b219289 /cmd | |
parent | 734acc776a1156d22dabedd420053d834663a22e (diff) |
cmd: Fix defaulting admin address if empty in config, fixes `reload` (#4674)
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/commandfuncs.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go index 3323740..3cbe85b 100644 --- a/cmd/commandfuncs.go +++ b/cmd/commandfuncs.go @@ -735,7 +735,7 @@ func DetermineAdminAPIAddress(address, configFile, configAdapter string) (string 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 { var tmpStruct struct { Admin caddy.AdminConfig `json:"admin"` @@ -744,7 +744,9 @@ func DetermineAdminAPIAddress(address, configFile, configAdapter string) (string if err != nil { return "", fmt.Errorf("unmarshaling admin listener address from config: %v", err) } - return tmpStruct.Admin.Listen, nil + if tmpStruct.Admin.Listen != "" { + return tmpStruct.Admin.Listen, nil + } } } |