Allow awaiting on server handles #550
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
niklasad1
reviewed
Nov 4, 2021
| stop_sender: mpsc::Sender<()>, | ||
| stop_handle: Option<tokio::task::JoinHandle<()>>, | ||
| pub(crate) handle: Option<tokio::task::JoinHandle<()>>, |
There was a problem hiding this comment.
Is pub(crate) only needed for tests or why?
niklasad1
reviewed
Nov 4, 2021
niklasad1
reviewed
Nov 4, 2021
| server_handle.with_timeout(TIMEOUT).await.unwrap_err(); | ||
|
|
||
| let (_addr, server_handle) = server().await; | ||
| server_handle.handle.as_ref().unwrap().abort(); |
There was a problem hiding this comment.
ok, you did this instead of stop because it moves the JoinHandle?
There was a problem hiding this comment.
Stop is a little bit different, here we want to emulate the actual server behavior -- if a task is cancelled or panics, the future handle resolves too.
niklasad1
reviewed
Nov 4, 2021
niklasad1
reviewed
Nov 4, 2021
niklasad1
approved these changes
Nov 5, 2021
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.
HttpStopHandleandWsStopHandletoHttpServerHandleandWsServerHandlerespectivelyFuturefor both allowing to doto run the server forever.
The interfaces for HTTP and WS are slightly different in the sense that the latter handle can be cloned. This can be easily implemented via channels for HTTP but that's a subject for different PR and was not introduced here.
Resolves #547