Skip to content

Duration #19

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
merged 2 commits into from
Dec 24, 2020
Merged

Duration #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f8136a
Prefer std::time::Duration
hjr3 Dec 24, 2020
27eb736
Clean up Service implementation
hjr3 Dec 24, 2020
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
40 changes: 18 additions & 22 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ use std::future::Future;
use std::io;
use std::pin::Pin;
use std::task::{Context, Poll};
use std::time::Duration;

use tokio::io::{AsyncRead, AsyncWrite};
use tokio::time::{timeout, Duration};
use tokio::time::timeout;
use tokio_io_timeout::TimeoutStream;

use hyper::client::connect::{Connect, Connected, Connection};
Expand Down Expand Up @@ -58,33 +59,28 @@ where
}

fn call(&mut self, dst: Uri) -> Self::Future {
let connect_timeout = self.connect_timeout;
let read_timeout = self.read_timeout;
let write_timeout = self.write_timeout;
let connecting = self.connector.call(dst);

if self.connect_timeout.is_none() {
let fut = async move {
let io = connecting.await.map_err(Into::into)?;

let mut tm = TimeoutConnectorStream::new(TimeoutStream::new(io));
tm.set_read_timeout(read_timeout);
tm.set_write_timeout(write_timeout);
Ok(Box::pin(tm))
};

return Box::pin(fut);
}

let connect_timeout = self.connect_timeout.expect("Connect timeout should be set");
let timeout = timeout(connect_timeout, connecting);

let fut = async move {
let connecting = timeout
.await
.map_err(|e| io::Error::new(io::ErrorKind::TimedOut, e))?;
let io = connecting.map_err(Into::into)?;
let stream = match connect_timeout {
None => {
let io = connecting.await.map_err(Into::into)?;
TimeoutStream::new(io)
}
Some(connect_timeout) => {
let timeout = timeout(connect_timeout, connecting);
let connecting = timeout
.await
.map_err(|e| io::Error::new(io::ErrorKind::TimedOut, e))?;
let io = connecting.map_err(Into::into)?;
TimeoutStream::new(io)
}
};

let mut tm = TimeoutConnectorStream::new(TimeoutStream::new(io));
let mut tm = TimeoutConnectorStream::new(stream);
tm.set_read_timeout(read_timeout);
tm.set_write_timeout(write_timeout);
Ok(Box::pin(tm))
Expand Down