Skip to content

Implement timeouts #149

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
caelunshun merged 1 commit into from
Oct 4, 2019
Merged

Implement timeouts #149

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
6 changes: 4 additions & 2 deletions server/src/io/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ use futures::{select, StreamExt};
use futures::{FutureExt, SinkExt};
use std::net::SocketAddr;
use std::sync::Arc;
use std::time::Duration;
use tokio::codec::Framed;
use tokio::net::TcpStream;
use tokio::timer::Timeout;

/// Runs a worker task for the given client.
pub async fn run_worker(
Expand Down Expand Up @@ -75,7 +77,7 @@ async fn _run_worker(

select! {
msg = rx_server_to_worker.next().fuse() => server_message = Some(msg),
packet = framed.next().fuse() => received_packet = Some(packet),
packet = Timeout::new(framed.next(), Duration::from_millis(10000)).fuse() => received_packet = Some(packet),
}

if let Some(msg) = server_message {
Expand All @@ -89,7 +91,7 @@ async fn _run_worker(
}

if let Some(packet_result) = received_packet {
if let Some(packet_result) = packet_result {
if let Some(packet_result) = packet_result? {
match packet_result {
Ok(packet) => {
if let Some(ih) = initial_handler.as_mut() {
Expand Down