Skip to content

Resolve pubsub future only when nothing can happen anymore #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Resolve pubsub future only when nothing can happen anymore #72

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3467a85
Resolve pubsub future only when nothing can happen anymore
dippi Jul 3, 2021
36bf772
Add tests to cover new pubsub completion policy
dippi Jul 4, 2021
b51f99f
Add a note on PubsubStream about the assumptions made
dippi Jul 4, 2021
26e1362
Reword expect in tests
dippi Jul 4, 2021
23a85ec
Add comment referencing the issue #50
dippi Jul 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add comment referencing the issue #50
  • Loading branch information
@dippi
dippi committed Jul 4, 2021
commit 23a85ec51830f1c286c7edc7ef6cfd950fb087bd
45 changes: 21 additions & 24 deletions src/client/pubsub.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,32 +193,28 @@ impl PubsubConnectionInner {
)));
}
},
b"unsubscribe" => {
match self.subscriptions.entry(topic) {
Entry::Occupied(entry) => {
entry.remove_entry();
}
Entry::Vacant(vacant) => {
return Err(error::internal(format!(
"Unexpected unsubscribe message: {}",
vacant.key()
)));
}
b"unsubscribe" => match self.subscriptions.entry(topic) {
Entry::Occupied(entry) => {
entry.remove_entry();
}
}
b"punsubscribe" => {
match self.psubscriptions.entry(topic) {
Entry::Occupied(entry) => {
entry.remove_entry();
}
Entry::Vacant(vacant) => {
return Err(error::internal(format!(
"Unexpected unsubscribe message: {}",
vacant.key()
)));
}
Entry::Vacant(vacant) => {
return Err(error::internal(format!(
"Unexpected unsubscribe message: {}",
vacant.key()
)));
}
}
},
b"punsubscribe" => match self.psubscriptions.entry(topic) {
Entry::Occupied(entry) => {
entry.remove_entry();
}
Entry::Vacant(vacant) => {
return Err(error::internal(format!(
"Unexpected unsubscribe message: {}",
vacant.key()
)));
}
},
b"message" => match self.subscriptions.get(&topic) {
Some(sender) => {
if let Err(error) = sender.unbounded_send(Ok(msg)) {
Expand Down Expand Up @@ -531,6 +527,7 @@ mod test {
}

#[tokio::test]
/// Regression test for https://github.com/benashford/redis-async-rs/issues/50
async fn test_connection_remains_open_after_unsubscription() {
let addr = "127.0.0.1:6379".parse().unwrap();
let pubsub = super::pubsub_connect(addr)
Expand Down