fix(server): Make sleep_on_errors configurable and use it in example

This commit is contained in:
Klaus Purer
2018-02-24 16:19:01 +01:00
parent 68458cde57
commit 3a36eb5596
2 changed files with 14 additions and 4 deletions

View File

@@ -19,7 +19,10 @@ fn main() {
.with_body(PHRASE)) .with_body(PHRASE))
})); }));
let server = Http::new().bind(&addr, new_service).unwrap(); let server = Http::new()
.sleep_on_errors(true)
.bind(&addr, new_service)
.unwrap();
println!("Listening on http://{} with 1 thread.", server.local_addr().unwrap()); println!("Listening on http://{} with 1 thread.", server.local_addr().unwrap());
server.run().unwrap(); server.run().unwrap();
} }

View File

@@ -664,6 +664,7 @@ impl Stream for AddrIncoming {
type Error = ::std::io::Error; type Error = ::std::io::Error;
fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> { fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> {
// Check if a previous timeout is active that was set by IO errors.
if let Some(ref mut to) = self.timeout { if let Some(ref mut to) = self.timeout {
match to.poll().expect("timeout never fails") { match to.poll().expect("timeout never fails") {
Async::Ready(_) => {} Async::Ready(_) => {}
@@ -682,8 +683,13 @@ impl Stream for AddrIncoming {
return Ok(Async::Ready(Some(AddrStream::new(socket, addr)))); return Ok(Async::Ready(Some(AddrStream::new(socket, addr))));
}, },
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => return Ok(Async::NotReady), Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => return Ok(Async::NotReady),
Err(ref e) if connection_error(e) => continue, Err(ref e) if self.sleep_on_errors => {
Err(e) => { // Connection errors can be ignored directly, continue by
// accepting the next request.
if connection_error(e) {
continue;
}
// Sleep 10ms.
let delay = ::std::time::Duration::from_millis(10); let delay = ::std::time::Duration::from_millis(10);
debug!("Accept error: {}. Sleeping {:?}...", debug!("Accept error: {}. Sleeping {:?}...",
e, delay); e, delay);
@@ -698,7 +704,8 @@ impl Stream for AddrIncoming {
return Ok(Async::NotReady); return Ok(Async::NotReady);
} }
} }
} },
Err(e) => return Err(e),
} }
} }
} }