Skip to content
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.

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

channel: Return PostAction::Remove on disconnect #208

Merged
merged 1 commit into from
Sep 6, 2024
Merged
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/sources/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ impl<T> EventSource for Channel<T> {
let receiver = &self.receiver;
let capacity = self.capacity;
let mut clear_readiness = false;
let mut disconnected = false;

let action = self
.source
Expand All @@ -226,15 +227,17 @@ impl<T> EventSource for Channel<T> {
}
Err(mpsc::TryRecvError::Disconnected) => {
callback(Event::Closed, &mut ());
clear_readiness = true;
disconnected = true;
break;
}
}
}
})
.map_err(ChannelError)?;

if clear_readiness {
if disconnected {
Ok(PostAction::Remove)
} else if clear_readiness {
Ok(action)
} else {
// Re-notify the ping source so we can try again.
Expand Down
Loading