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.

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

Jump to bottom

[Tokio migration] Better joining of session tasks #691

Merged
merged 1 commit into from
Apr 13, 2021
Merged

[Tokio migration] Better joining of session tasks #691

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
13 changes: 9 additions & 4 deletions core/src/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
use byteorder::{BigEndian, ByteOrder};
use bytes::Bytes;
use futures_core::TryStream;
use futures_util::{FutureExt, StreamExt, TryStreamExt};
use futures_util::{future, StreamExt, TryStreamExt};
use once_cell::sync::OnceCell;
use thiserror::Error;
use tokio::sync::mpsc;
Expand Down Expand Up @@ -126,9 +126,14 @@ impl Session {
.forward(sink);
let receiver_task = DispatchTask(stream, session.weak());

let task =
futures_util::future::join(sender_task, receiver_task).map(|_| io::Result::<_>::Ok(()));
tokio::spawn(task);
tokio::spawn(async move {
let result = future::try_join(sender_task, receiver_task).await;

if let Err(e) = result {
error!("{}", e);
}
});

session
}

Expand Down