diff options
author | Matthew Holt <[email protected]> | 2022-03-03 10:57:55 -0700 |
---|---|---|
committer | Matthew Holt <[email protected]> | 2022-03-03 10:58:15 -0700 |
commit | ceef70dbc5543436b04a5f70749be18582f35403 (patch) | |
tree | eb46e155dc5b79bb71d8fd8a4065b2c1eda79c66 /admin.go | |
parent | f5e104944ea48e776580a0a9ebbd02fca33d659f (diff) | |
download | caddy-ceef70dbc5543436b04a5f70749be18582f35403.tar.gz caddy-ceef70dbc5543436b04a5f70749be18582f35403.zip |
core: Retry dynamic config load if error or no-op (#4603)
Also fix ineffectual assignment (unrelated)
Diffstat (limited to 'admin.go')
-rw-r--r-- | admin.go | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -262,7 +262,7 @@ func (admin *AdminConfig) newAdminHandler(addr NetworkAddress, remote bool) admi // provisionAdminRouters provisions all the router modules // in the admin.api namespace that need provisioning. -func (admin AdminConfig) provisionAdminRouters(ctx Context) error { +func (admin *AdminConfig) provisionAdminRouters(ctx Context) error { for _, router := range admin.routers { provisioner, ok := router.(Provisioner) if !ok { @@ -277,6 +277,7 @@ func (admin AdminConfig) provisionAdminRouters(ctx Context) error { // We no longer need the routers once provisioned, allow for GC admin.routers = nil + return nil } |