admin: Make sure that any admin routers are provisioned when local/re…#6997
Merged
mholt merged 2 commits intocaddyserver:masterfrom May 6, 2025
Merged
admin: Make sure that any admin routers are provisioned when local/re…#6997mholt merged 2 commits intocaddyserver:masterfrom
mholt merged 2 commits intocaddyserver:masterfrom
Conversation
…mote admin servers are replaced at runtime.
mholt
approved these changes
May 6, 2025
Member
mholt
left a comment
There was a problem hiding this comment.
Ah thanks, this is probably more correct :)
1 task
mohammed90
pushed a commit
to cedricziel/caddy
that referenced
this pull request
Aug 29, 2025
caddyserver#6997) * admin: Make sure that any admin routers are provisioned when local/remote admin servers are replaced at runtime. * admin: check for provisioning errors during admin server replacements
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…mote admin servers are replaced at runtime.
Fixes issue #6931
Background
When the remote admin servers are reloaded at runtime (or as part of the final initialization phase at boot), the local state in the new instances aren't fully initialized. This is due to
New()ing each module up during the call tonewAdminHandler, but never actually provisioning it. As a result, themetricsHandlerandregistrymembers arenil, causing the metrics endpoint to crash and return an empty response when invoked via the remote admin API.This change makes sure that we call the
provisionAdminRoutersmethod when both local and remote admin servers are reloaded and replaced. This should ensure consistent behavior in the future between reloads.