fix(rpc module): close subscription task when a subscription is unsubscribed via the unsubscribe call
#743
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
commented
Apr 28, 2022
niklasad1
commented
Apr 28, 2022
niklasad1
commented
Apr 28, 2022
niklasad1
commented
Apr 28, 2022
jsdw
reviewed
Apr 29, 2022
This reverts commit 366176a.
jsdw
reviewed
Apr 29, 2022
core/src/server/rpc_module.rs
Outdated
| } | ||
| }; | ||
|
|
||
| let sub_closed = match self.unsubscribe.take() { |
There was a problem hiding this comment.
Ah I see, so this oneshot unsubscribe channel is removed here, which means we can only use pipe_from_try_stream once.
Is it possible to take a mutable ref to it instead to use below (which may need pinning)? Maybe then this method would still be reusable?
There was a problem hiding this comment.
it won't work because send takes a &self as well.
I changed it to tokio::sync::watch for ease of use.
The receiver is clonable and it's possible to check whether the sender is still alive
dvdplm
approved these changes
Apr 29, 2022
Co-authored-by: David <[email protected]>
Co-authored-by: David <[email protected]>
jsdw
reviewed
Apr 29, 2022
| @@ -108,6 +100,48 @@ pub async fn websocket_server_with_subscription() -> (SocketAddr, WsServerHandle | |||
| }) | |||
| .unwrap(); | |||
|
|
|||
| module | |||
| .register_subscription("subscribe_5_ints", "n", "unsubscribe_5_ints", |_, pending, _| { | |||
There was a problem hiding this comment.
Now we can call pipe_from_stream more than once, should we also have a test to make sure that we can?
niklasad1
changed the title
unsubscribed via the unsubscribe callunsubscribed via the unsubscribe call
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 reason for this is that the stream passed to
pipe_from_streammight not produce new items and that can lead to that calls that areunsubscribedis not terminated until an item for the underlying stream is produced.In worst these tasks will not be terminated until the actual connection is closed which this fixes.
After this PR the subscriptions is terminated once the unsubscribe call is received.