Make KestrelConfigurationLoader.Load safe to re-call #48137
Merged
Conversation
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
If it is called again and nothing has changed, it should do nothing. Part of dotnet#45801
amcasey
requested review from
BrennanConroy,
JamesNK,
Tratcher,
halter73 and
mgravell
as code owners
ghost
added
the
Tratcher
reviewed
May 8, 2023
halter73
reviewed
May 8, 2023
| // Any endpoints that were removed from the last time endpoints were loaded are returned. | ||
| internal (List<ListenOptions>, List<ListenOptions>) Reload() | ||
| { | ||
| _reloadToken = Configuration.GetReloadToken(); |
Member
There was a problem hiding this comment.
Suggested change
| _reloadToken = Configuration.GetReloadToken(); | |
| _reloadToken = ReloadOnChange ? Configuration.GetReloadToken() : NullChangeToken.Singleton; |
We should not grab the token on load if KestrelConfigurationLoader.ReloadOnChange is false. That's what the is DoesNotReloadOnConfigurationChangeByDefault test is about. Normally it's true if you have a "default" host like WebApplication.
You'll need to add using Microsoft.Extensions.FileProviders too. Not the best namespace there.
Member
Author
There was a problem hiding this comment.
I didn't change the existing IChangeToken handling, so I believe that test is still passing. I intentionally decoupled rebind-on-change from determine-if-reloading-would-be-redundant, but I'm open to discussion.
Member
Author
There was a problem hiding this comment.
Why am I pulling in Microsoft.Extensions.FileProviders?
src/Servers/Kestrel/Kestrel/test/KestrelConfigurationLoaderTests.cs
Outdated
Show resolved
Hide resolved
src/Servers/Kestrel/Kestrel/test/KestrelConfigurationLoaderTests.cs
Outdated
Show resolved
Hide resolved
4 tasks
halter73
approved these changes
May 9, 2023
...so that `Load` can retain its current behavior. Also, only consume the change token when `ReloadOnChange` is true.
amcasey
added a commit
to amcasey/aspnetcore
that referenced
this pull request
May 12, 2023
So that configuration-based certs will be considered, if necessary. Largely salvaged from dotnet#48056 Builds on dotnet#48137 Fixes dotnet#45801
amcasey
added a commit
that referenced
this pull request
May 17, 2023
amcasey
added
area-networking
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
If it is called again and nothing has changed, it should do nothing.
Part of #45801