Improve notification loop exit #5233
Merged
Conversation
This file contains 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
dotnet-issue-labeler
bot
added
the
area-app-model
radical
reviewed
Aug 9, 2024
| @@ -77,21 +74,23 @@ await foreach (var resourceEvent in resourceNotificationService.WatchAsync(cance | |||
| if (loggingResourceIds.Add(resourceId)) | |||
| { | |||
| // Start watching the logs for this resource ID | |||
| logWatchTasks.Add(WatchResourceLogs(tcs, resourceId, logTexts, resourceLoggerService, cancellationToken)); | |||
| logWatchTasks.Add(WatchResourceLogs(tcs, resourceId, logTexts, resourceLoggerService, cancellationTokenSource)); | |||
There was a problem hiding this comment.
Are we using logWatchTasks here to root them to the method so they don't get collected?
There was a problem hiding this comment.
I believe these would just be on the ThreadPool so they wouldn't be collected, but not sure. Feels safer this way, unless someone says it's fine without.
radical
reviewed
Aug 9, 2024
|
|
||
| await Task.WhenAny(logWatchTasks).ConfigureAwait(false); | ||
| } | ||
| catch (OperationCanceledException) |
There was a problem hiding this comment.
Is this restricted to the case where cancellationTokenSource.IsCancellationRequested==true?
radical
reviewed
Aug 9, 2024
radical
approved these changes
Aug 9, 2024
eerhardt
approved these changes
Aug 9, 2024
tests/Aspire.Hosting.Tests/Utils/LoggerNotificationExtensions.cs
Outdated
Show resolved
Hide resolved
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
WaitAsyncloop when text is found.OperationCanceledExceptionas they are expected.Microsoft Reviewers: Open in CodeFlow