Timeouts for all requests #406
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
Co-authored-by: Maciej Hirsz <1096222+maciejhirsz@users.noreply.github.com>
* master: (21 commits) New proc macro (#387) Streaming RpcParams parsing (#401) Set allowed Host header values (#399) Synchronization-less async connections in ws-server (#388) [ws server]: terminate already established connection(s) when the server is stopped (#396) feat: customizable JSON-RPC error codes via new enum variant on `CallErrror` (#394) [ci]: test each individual crate's manifest (#392) Add a way to stop servers (#386) [jsonrpsee types]: unify a couple of types + more tests (#389) Update roadmap link in readme (#390) Cross-origin protection (#375) Method aliases + RpcModule: Clone (#383) Use criterion's async bencher (#385) Async/subscription benches (#372) send text (#374) Fix link to ws server in README.md (#373) Concat -> simple push (#370) Add missing `rt` feature (#369) Release prep for v0.2 (#368) chore(scripts): publish script (#354) ...
maciejhirsz
approved these changes
Jul 6, 2021
ws-client/src/client.rs
Outdated
Comment on lines
323
to
327
| futures::pin_mut!(fut, timeout); | ||
| let res = match futures::future::select(fut, timeout).await { | ||
| futures::future::Either::Left((res, _)) => res, | ||
| futures::future::Either::Right((_, _)) => return Err(Error::RequestTimeout), | ||
| }; |
There was a problem hiding this comment.
I reckon using futures::select! would improve readability here.
ws-client/src/helpers.rs
Outdated
| rx: oneshot::Receiver<Result<T, Error>>, | ||
| ) -> Result<Result<T, Error>, oneshot::Canceled> { | ||
| let timeout = crate::tokio::sleep(timeout); | ||
| futures::pin_mut!(rx, timeout); |
There was a problem hiding this comment.
ditto about select! macro
dvdplm
commented
Jul 7, 2021
ws-client/Cargo.toml
Outdated
| @@ -22,7 +22,7 @@ tokioV02-util = { package="tokio-util", version = "0.3", features = ["compat"], | |||
|
|
|||
| async-trait = "0.1" | |||
| fnv = "1" | |||
| futures = { version = "0.3.14", default-features = false, features = ["std"] } | |||
| futures = { version = "0.3.14", default-features = false, features = ["std", "async-await"] } | |||
There was a problem hiding this comment.
@maciejhirsz I wonder if this was the reason for not using select!, to keep the required features down?
There was a problem hiding this comment.
Interesting. The select! in futures also seems to have some weird requirements. Tokio has a select! macro that works identical, but doesn't require any .fuse() or pin_mut!() calls.
This was referenced Jul 9, 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.
Variant of #367
This PR takes a more opinionated stance than #367, where timeouts are optional. In this PR I suggest we make a all requests use a timeout and only let users choose the length.