berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

remove extra branch on enabled response timeout

This commit is contained in:
fakeshadow 2021-01-26 18:50:16 -08:00
parent 45a841e8c7
commit f9b2047782
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
awc/src/response.rs
View File

@ -31,7 +31,7 @@ pub struct ClientResponse<S = PayloadStream> {
/// See `ClientResponse::_timeout` for reason. /// See `ClientResponse::_timeout` for reason.
pub(crate) enum ResponseTimeout { pub(crate) enum ResponseTimeout {
Disabled(Option<Pin<Box<Sleep>>>), Disabled(Option<Pin<Box<Sleep>>>),
Enabled(Option<Pin<Box<Sleep>>>), Enabled(Pin<Box<Sleep>>),
} }
impl Default for ResponseTimeout { impl Default for ResponseTimeout {
@ -43,24 +43,19 @@ impl Default for ResponseTimeout {
impl ResponseTimeout { impl ResponseTimeout {
fn poll_timeout(&mut self, cx: &mut Context<'_>) -> Result<(), PayloadError> { fn poll_timeout(&mut self, cx: &mut Context<'_>) -> Result<(), PayloadError> {
match *self { match *self {
Self::Disabled(_) => Ok(()), Self::Enabled(ref mut timeout) => {
Self::Enabled(Some(ref mut timeout)) => {
if timeout.as_mut().poll(cx).is_ready() { if timeout.as_mut().poll(cx).is_ready() {
Err(Self::err()) Err(PayloadError::Io(io::Error::new(
io::ErrorKind::TimedOut,
"Response Payload IO timed out",
)))
} else { } else {
Ok(()) Ok(())
} }
} }
Self::Enabled(None) => Err(Self::err()), Self::Disabled(_) => Ok(()),
} }
} }
fn err() -> PayloadError {
PayloadError::Io(io::Error::new(
io::ErrorKind::TimedOut,
"Response Payload IO timed out",
))
}
} }
impl<S> HttpMessage for ClientResponse<S> { impl<S> HttpMessage for ClientResponse<S> {
@ -158,16 +153,16 @@ impl<S> ClientResponse<S> {
pub fn timeout(self, dur: Duration) -> Self { pub fn timeout(self, dur: Duration) -> Self {
let timeout = match self.timeout { let timeout = match self.timeout {
ResponseTimeout::Disabled(Some(mut timeout)) ResponseTimeout::Disabled(Some(mut timeout))
| ResponseTimeout::Enabled(Some(mut timeout)) => { | ResponseTimeout::Enabled(mut timeout) => {
match Instant::now().checked_add(dur) { match Instant::now().checked_add(dur) {
Some(deadline) => { Some(deadline) => {
timeout.as_mut().reset(deadline.into()); timeout.as_mut().reset(deadline.into());
ResponseTimeout::Enabled(Some(timeout)) ResponseTimeout::Enabled(timeout)
} }
None => ResponseTimeout::Enabled(Some(Box::pin(sleep(dur)))), None => ResponseTimeout::Enabled(Box::pin(sleep(dur))),
} }
} }
_ => ResponseTimeout::Enabled(Some(Box::pin(sleep(dur)))), _ => ResponseTimeout::Enabled(Box::pin(sleep(dur))),
}; };
Self { Self {