Browse Source
cmd: Fix defaulting admin address if empty in config, fixes `reload` (#4674)
master
Francis Lavoie
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
2 deletions
-
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,9 +744,11 @@ func DetermineAdminAPIAddress(address, configFile, configAdapter string) (string |
|
|
|
if err != nil { |
|
|
|
return "", fmt.Errorf("unmarshaling admin listener address from config: %v", err) |
|
|
|
} |
|
|
|
if tmpStruct.Admin.Listen != "" { |
|
|
|
return tmpStruct.Admin.Listen, nil |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// Fallback to the default listen address otherwise
|
|
|
|
return caddy.DefaultAdminListen, nil |
|
|
|