From 22d8edb984b9a0cbe5d205f823b455920464bb95 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Sun, 3 Apr 2022 12:04:33 -0400 Subject: cmd: Fix defaulting admin address if empty in config, fixes `reload` (#4674) --- cmd/commandfuncs.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go index 332374013..3cbe85b90 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 + } } } -- cgit v1.2.3