From 41a249459c5426003d8b6406bd817d4a18243060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Fri, 5 Nov 2021 11:50:58 +0100 Subject: [PATCH] aquatic_udp: glommio: await send/recv on shared channels --- aquatic_udp/src/lib/glommio/handlers.rs | 4 ++-- aquatic_udp/src/lib/glommio/network.rs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aquatic_udp/src/lib/glommio/handlers.rs b/aquatic_udp/src/lib/glommio/handlers.rs index fbfbcb2..862710f 100644 --- a/aquatic_udp/src/lib/glommio/handlers.rs +++ b/aquatic_udp/src/lib/glommio/handlers.rs @@ -105,8 +105,8 @@ async fn handle_request_stream( ::log::debug!("preparing to send response to channel: {:?}", response); - if let Err(err) = response_senders.try_send_to(producer_index, (response, src)) { - ::log::warn!("response_sender.try_send: {:?}", err); + if let Err(err) = response_senders.send_to(producer_index, (response, src)).await { + ::log::error!("response_sender.send: {:?}", err); } yield_if_needed().await; diff --git a/aquatic_udp/src/lib/glommio/network.rs b/aquatic_udp/src/lib/glommio/network.rs index a32917a..c42ea57 100644 --- a/aquatic_udp/src/lib/glommio/network.rs +++ b/aquatic_udp/src/lib/glommio/network.rs @@ -240,15 +240,15 @@ async fn read_requests( let request_consumer_index = calculate_request_consumer_index(&config, request.info_hash); - if let Err(err) = request_senders.try_send_to( + if let Err(err) = request_senders.send_to( request_consumer_index, ( response_consumer_index, ConnectedRequest::Announce(request), src, ), - ) { - ::log::warn!("request_sender.try_send failed: {:?}", err) + ).await { + ::log::error!("request_sender.try_send failed: {:?}", err) } } else { let response = Response::Error(ErrorResponse { @@ -300,11 +300,11 @@ async fn read_requests( original_indices, }; - if let Err(err) = request_senders.try_send_to( + if let Err(err) = request_senders.send_to( consumer_index, (response_consumer_index, request, src), - ) { - ::log::warn!("request_sender.try_send failed: {:?}", err) + ).await { + ::log::error!("request_sender.send failed: {:?}", err) } } }