diff --git a/actix-server-config/src/lib.rs b/actix-server-config/src/lib.rs index b3218825..fa8735fc 100644 --- a/actix-server-config/src/lib.rs +++ b/actix-server-config/src/lib.rs @@ -1,4 +1,5 @@ use std::cell::Cell; +use std::fmt; use std::net::SocketAddr; use std::rc::Rc; @@ -63,22 +64,27 @@ impl Io { } impl Io { + /// Reconstruct from a parts. pub fn from_parts(io: T, params: P, proto: Protocol) -> Self { Self { io, params, proto } } + /// Deconstruct into a parts. pub fn into_parts(self) -> (T, P, Protocol) { (self.io, self.params, self.proto) } - pub fn io(&self) -> &T { + /// Returns a shared reference to the underlying stream. + pub fn get_ref(&self) -> &T { &self.io } - pub fn io_mut(&mut self) -> &mut T { + /// Returns a mutable reference to the underlying stream. + pub fn get_mut(&mut self) -> &mut T { &mut self.io } + /// Get selected protocol pub fn protocol(&self) -> Protocol { self.proto } @@ -95,3 +101,9 @@ impl Io { } } } + +impl fmt::Debug for Io { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "Io {{{:?}}}", self.io) + } +} diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs index 13fe5e9a..2cc6c360 100644 --- a/actix-server/tests/test_server.rs +++ b/actix-server/tests/test_server.rs @@ -102,7 +102,7 @@ fn test_start() { let _ = srv.pause(); thread::sleep(time::Duration::from_millis(100)); assert!(net::TcpStream::connect_timeout(&addr, time::Duration::from_millis(100)).is_ok()); - thread::sleep(time::Duration::from_millis(100)); + thread::sleep(time::Duration::from_millis(400)); assert!(net::TcpStream::connect_timeout(&addr, time::Duration::from_millis(100)).is_err()); // resume diff --git a/examples/basic.rs b/examples/basic.rs index d2f90901..44d3c0c3 100644 --- a/examples/basic.rs +++ b/examples/basic.rs @@ -9,7 +9,7 @@ use std::{env, fmt, io}; use actix_codec::{AsyncRead, AsyncWrite}; use actix_rt::System; -use actix_server::Server; +use actix_server::{Io, Server}; use actix_service::{fn_service, NewService}; use futures::{future, Future}; use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod}; @@ -54,8 +54,8 @@ fn main() -> io::Result<()> { let acceptor = acceptor.clone(); // service for converting incoming TcpStream to a SslStream - fn_service(move |stream: tokio_tcp::TcpStream| { - SslAcceptorExt::accept_async(&acceptor, stream) + fn_service(move |stream: Io| { + SslAcceptorExt::accept_async(&acceptor, stream.into_parts().0) .map_err(|e| println!("Openssl error: {}", e)) }) // .and_then() combinator uses other service to convert incoming `Request` to a