Skip to content

turn: use ok_or() to simplify command_tx #689

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

Merged
rainliu merged 1 commit into from
Jun 9, 2025
Merged

turn: use ok_or() to simplify command_tx #689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 16 additions & 22 deletions turn/src/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,16 @@ impl Server {
pub async fn delete_allocations_by_username(&self, username: String) -> Result<()> {
let tx = {
let command_tx = self.command_tx.lock().await;
command_tx.clone()
command_tx.clone().ok_or(Error::ErrClosed)?
};
if let Some(tx) = tx {
let (closed_tx, closed_rx) = mpsc::channel(1);
tx.send(Command::DeleteAllocations(username, Arc::new(closed_rx)))
.map_err(|_| Error::ErrClosed)?;

closed_tx.closed().await;
let (closed_tx, closed_rx) = mpsc::channel(1);
tx.send(Command::DeleteAllocations(username, Arc::new(closed_rx)))
.map_err(|_| Error::ErrClosed)?;

Ok(())
} else {
Err(Error::ErrClosed)
}
closed_tx.closed().await;

Ok(())
}

/// Get information of [`Allocation`][`Allocation`]s by specified [`FiveTuple`]s.
Expand All @@ -121,23 +118,20 @@ impl Server {

let tx = {
let command_tx = self.command_tx.lock().await;
command_tx.clone()
command_tx.clone().ok_or(Error::ErrClosed)?
};
if let Some(tx) = tx {
let (infos_tx, mut infos_rx) = mpsc::channel(1);
tx.send(Command::GetAllocationsInfo(five_tuples, infos_tx))
.map_err(|_| Error::ErrClosed)?;

let mut info: HashMap<FiveTuple, AllocationInfo> = HashMap::new();
let (infos_tx, mut infos_rx) = mpsc::channel(1);
tx.send(Command::GetAllocationsInfo(five_tuples, infos_tx))
.map_err(|_| Error::ErrClosed)?;

for _ in 0..tx.receiver_count() {
info.extend(infos_rx.recv().await.ok_or(Error::ErrClosed)?);
}
let mut info: HashMap<FiveTuple, AllocationInfo> = HashMap::new();

Ok(info)
} else {
Err(Error::ErrClosed)
for _ in 0..tx.receiver_count() {
info.extend(infos_rx.recv().await.ok_or(Error::ErrClosed)?);
}

Ok(info)
}

async fn read_loop(
Expand Down
Loading