router: ensure the router proxy loop is broken out of on shutdown #413
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
…read handle Signed-off-by: gterzian <[email protected]>
Member
Author
|
Relates to servo/servo#30849 |
Taym95
approved these changes
Aug 27, 2025
| .take() | ||
| .expect("Should have a join handle at shutdown") | ||
| .join() | ||
| .expect("Failed to join on the router proxy thread"); |
Member
There was a problem hiding this comment.
nit: we can avoid panicking here:
if let Err(err) = handle.join() {
error!("Router thread panicked during shutdown: {:?}", err);
}
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.
The current shutdown does a break, but that only breaks out of the inner event-handling loop, so the thread doesn't actually shut down. This replaces it with a return, and also joins on the thread handle for good measure. Includes unrelated changes from an fmt.
Testing: added a unit test.