1
0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-24 07:53:00 +01:00

handle http connections in different threads

This commit is contained in:
Nikolay Kim 2017-12-12 17:21:00 -08:00
parent 55818028cb
commit ab6efd2421
6 changed files with 394 additions and 117 deletions

View File

@ -46,6 +46,7 @@ regex = "0.2"
sha1 = "0.2" sha1 = "0.2"
url = "1.5" url = "1.5"
libc = "0.2" libc = "0.2"
socket2 = "0.2"
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
flate2 = "0.2" flate2 = "0.2"
@ -53,6 +54,7 @@ brotli2 = "^0.3.2"
percent-encoding = "1.0" percent-encoding = "1.0"
smallvec = "0.6" smallvec = "0.6"
bitflags = "1.0" bitflags = "1.0"
num_cpus = "1.0"
cookie = { version="0.10", features=["percent-encode", "secure"] } cookie = { version="0.10", features=["percent-encode", "secure"] }
# tokio # tokio

View File

@ -30,7 +30,7 @@ fn main() {
let pkcs12 = Pkcs12::from_der(&pkcs12).unwrap().parse("12345").unwrap(); let pkcs12 = Pkcs12::from_der(&pkcs12).unwrap().parse("12345").unwrap();
HttpServer::new( HttpServer::new(
Application::new("/") || Application::new()
// enable logger // enable logger
.middleware(middlewares::Logger::default()) .middleware(middlewares::Logger::default())
// register simple handler, handle all methods // register simple handler, handle all methods
@ -42,7 +42,7 @@ fn main() {
.header("LOCATION", "/index.html") .header("LOCATION", "/index.html")
.body(Body::Empty) .body(Body::Empty)
}))) })))
.serve_tls::<_, ()>("127.0.0.1:8443", pkcs12).unwrap(); .serve_tls::<_, ()>("127.0.0.1:8443", &pkcs12).unwrap();
println!("Started http server: 127.0.0.1:8443"); println!("Started http server: 127.0.0.1:8443");
let _ = sys.run(); let _ = sys.run();

View File

@ -42,7 +42,7 @@ Multiple applications could be served with one server:
use actix_web::*; use actix_web::*;
fn main() { fn main() {
HttpServer::<TcpStream, SocketAddr, _>::new(|| vec![ HttpServer::<TcpStream, SocketAddr, _, _>::new(|| vec![
Application::new() Application::new()
.prefix("/app1") .prefix("/app1")
.resource("/", |r| r.f(|r| httpcodes::HTTPOk)), .resource("/", |r| r.f(|r| httpcodes::HTTPOk)),

View File

@ -34,6 +34,8 @@ extern crate flate2;
extern crate brotli2; extern crate brotli2;
extern crate percent_encoding; extern crate percent_encoding;
extern crate smallvec; extern crate smallvec;
extern crate num_cpus;
extern crate socket2;
extern crate actix; extern crate actix;
extern crate h2 as http2; extern crate h2 as http2;

View File

@ -1,24 +1,27 @@
use std::{io, net}; use std::{io, net, thread};
use std::rc::Rc; use std::rc::Rc;
use std::net::SocketAddr; use std::sync::Arc;
use std::marker::PhantomData; use std::marker::PhantomData;
use actix::dev::*; use actix::dev::*;
use futures::Stream; use futures::Stream;
use futures::sync::mpsc;
use tokio_io::{AsyncRead, AsyncWrite}; use tokio_io::{AsyncRead, AsyncWrite};
use tokio_core::net::{TcpListener, TcpStream}; use tokio_core::net::TcpStream;
use num_cpus;
use socket2::{Socket, Domain, Type};
#[cfg(feature="tls")] #[cfg(feature="tls")]
use futures::Future; use futures::{future, Future};
#[cfg(feature="tls")] #[cfg(feature="tls")]
use native_tls::TlsAcceptor; use native_tls::TlsAcceptor;
#[cfg(feature="tls")] #[cfg(feature="tls")]
use tokio_tls::{TlsStream, TlsAcceptorExt}; use tokio_tls::{TlsStream, TlsAcceptorExt};
#[cfg(feature="alpn")] #[cfg(feature="alpn")]
use futures::Future; use futures::{future, Future};
#[cfg(feature="alpn")] #[cfg(feature="alpn")]
use openssl::ssl::{SslMethod, SslAcceptorBuilder}; use openssl::ssl::{SslMethod, SslAcceptor, SslAcceptorBuilder};
#[cfg(feature="alpn")] #[cfg(feature="alpn")]
use openssl::pkcs12::ParsedPkcs12; use openssl::pkcs12::ParsedPkcs12;
#[cfg(feature="alpn")] #[cfg(feature="alpn")]
@ -29,7 +32,7 @@ use channel::{HttpChannel, HttpHandler, IntoHttpHandler};
/// Various server settings /// Various server settings
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct ServerSettings { pub struct ServerSettings {
addr: Option<SocketAddr>, addr: Option<net::SocketAddr>,
secure: bool, secure: bool,
host: String, host: String,
} }
@ -46,7 +49,7 @@ impl Default for ServerSettings {
impl ServerSettings { impl ServerSettings {
/// Crate server settings instance /// Crate server settings instance
fn new(addr: Option<SocketAddr>, secure: bool) -> Self { fn new(addr: Option<net::SocketAddr>, secure: bool) -> Self {
let host = if let Some(ref addr) = addr { let host = if let Some(ref addr) = addr {
format!("{}", addr) format!("{}", addr)
} else { } else {
@ -60,7 +63,7 @@ impl ServerSettings {
} }
/// Returns the socket address of the local half of this TCP connection /// Returns the socket address of the local half of this TCP connection
pub fn local_addr(&self) -> Option<SocketAddr> { pub fn local_addr(&self) -> Option<net::SocketAddr> {
self.addr self.addr
} }
@ -82,47 +85,70 @@ impl ServerSettings {
/// `A` - peer address /// `A` - peer address
/// ///
/// `H` - request handler /// `H` - request handler
pub struct HttpServer<T, A, H> { pub struct HttpServer<T, A, H, U>
where H: 'static
{
h: Rc<Vec<H>>, h: Rc<Vec<H>>,
io: PhantomData<T>, io: PhantomData<T>,
addr: PhantomData<A>, addr: PhantomData<A>,
threads: usize,
factory: Arc<Fn() -> U + Send + Sync>,
workers: Vec<SyncAddress<Worker<H>>>,
} }
impl<T: 'static, A: 'static, H: 'static> Actor for HttpServer<T, A, H> { impl<T: 'static, A: 'static, H, U: 'static> Actor for HttpServer<T, A, H, U> {
type Context = Context<Self>; type Context = Context<Self>;
} }
impl<T, A, H> HttpServer<T, A, H> where H: HttpHandler impl<T, A, H, U, V> HttpServer<T, A, H, U>
where H: HttpHandler,
U: IntoIterator<Item=V> + 'static,
V: IntoHttpHandler<Handler=H>,
{ {
/// Create new http server with vec of http handlers /// Create new http server with vec of http handlers
pub fn new<V, F, U: IntoIterator<Item=V>>(factory: F) -> Self pub fn new<F>(factory: F) -> Self
where F: Fn() -> U + Send, where F: Sync + Send + 'static + Fn() -> U,
V: IntoHttpHandler<Handler=H>
{ {
let apps: Vec<_> = factory().into_iter().map(|h| h.into_handler()).collect(); HttpServer{ h: Rc::new(Vec::new()),
HttpServer{ h: Rc::new(apps),
io: PhantomData, io: PhantomData,
addr: PhantomData } addr: PhantomData,
threads: num_cpus::get(),
factory: Arc::new(factory),
workers: Vec::new(),
}
}
/// Set number of workers to start.
///
/// By default http server uses number of available logical cpu as threads count.
pub fn threads(mut self, num: usize) -> Self {
self.threads = num;
self
} }
} }
impl<T, A, H> HttpServer<T, A, H> impl<T, A, H, U, V> HttpServer<T, A, H, U>
where T: AsyncRead + AsyncWrite + 'static, where T: AsyncRead + AsyncWrite + 'static,
A: 'static, A: 'static,
H: HttpHandler, H: HttpHandler,
U: IntoIterator<Item=V> + 'static,
V: IntoHttpHandler<Handler=H>,
{ {
/// Start listening for incomming connections from stream. /// Start listening for incomming connections from a stream.
///
/// This method uses only one thread for handling incoming connections.
pub fn serve_incoming<S, Addr>(mut self, stream: S, secure: bool) -> io::Result<Addr> pub fn serve_incoming<S, Addr>(mut self, stream: S, secure: bool) -> io::Result<Addr>
where Self: ActorAddress<Self, Addr>, where Self: ActorAddress<Self, Addr>,
S: Stream<Item=(T, A), Error=io::Error> + 'static S: Stream<Item=(T, A), Error=io::Error> + 'static
{ {
// set server settings // set server settings
let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap(); let addr: net::SocketAddr = "127.0.0.1:8080".parse().unwrap();
let settings = ServerSettings::new(Some(addr), secure); let settings = ServerSettings::new(Some(addr), secure);
for h in Rc::get_mut(&mut self.h).unwrap().iter_mut() { let mut apps: Vec<_> = (*self.factory)().into_iter().map(|h| h.into_handler()).collect();
h.server_settings(settings.clone()); for app in &mut apps {
app.server_settings(settings.clone());
} }
self.h = Rc::new(apps);
// start server // start server
Ok(HttpServer::create(move |ctx| { Ok(HttpServer::create(move |ctx| {
@ -133,134 +159,226 @@ impl<T, A, H> HttpServer<T, A, H>
} }
fn bind<S: net::ToSocketAddrs>(&self, addr: S) fn bind<S: net::ToSocketAddrs>(&self, addr: S)
-> io::Result<Vec<(net::SocketAddr, TcpListener)>> -> io::Result<Vec<(net::SocketAddr, Socket)>>
{ {
let mut err = None; let mut err = None;
let mut addrs = Vec::new(); let mut sockets = Vec::new();
if let Ok(iter) = addr.to_socket_addrs() { if let Ok(iter) = addr.to_socket_addrs() {
for addr in iter { for addr in iter {
match TcpListener::bind(&addr, Arbiter::handle()) { match addr {
Ok(tcp) => addrs.push((addr, tcp)), net::SocketAddr::V4(a) => {
Err(e) => err = Some(e), let socket = Socket::new(Domain::ipv4(), Type::stream(), None)?;
match socket.bind(&a.into()) {
Ok(_) => {
socket.listen(1024)
.expect("failed to set socket backlog");
socket.set_reuse_address(true)
.expect("failed to set socket reuse address");
sockets.push((addr, socket));
},
Err(e) => err = Some(e),
}
}
net::SocketAddr::V6(a) => {
let socket = Socket::new(Domain::ipv6(), Type::stream(), None)?;
match socket.bind(&a.into()) {
Ok(_) => {
socket.listen(1024)
.expect("failed to set socket backlog");
socket.set_reuse_address(true)
.expect("failed to set socket reuse address");
sockets.push((addr, socket))
}
Err(e) => err = Some(e),
}
}
} }
} }
} }
if addrs.is_empty() {
if sockets.is_empty() {
if let Some(e) = err.take() { if let Some(e) = err.take() {
Err(e) Err(e)
} else { } else {
Err(io::Error::new(io::ErrorKind::Other, "Can not bind to address.")) Err(io::Error::new(io::ErrorKind::Other, "Can not bind to address."))
} }
} else { } else {
Ok(addrs) Ok(sockets)
} }
} }
fn start_workers(&mut self, settings: &ServerSettings)
-> Vec<mpsc::UnboundedSender<IoStream<net::TcpStream>>>
{
// start workers
let mut workers = Vec::new();
for _ in 0..self.threads {
let s = settings.clone();
let (tx, rx) = mpsc::unbounded::<IoStream<net::TcpStream>>();
let factory = Arc::clone(&self.factory);
let addr = Arbiter::start(move |ctx: &mut Context<_>| {
let mut apps: Vec<_> = (*factory)()
.into_iter().map(|h| h.into_handler()).collect();
for app in &mut apps {
app.server_settings(s.clone());
}
ctx.add_stream(rx);
Worker{h: Rc::new(apps)}
});
workers.push(tx);
self.workers.push(addr);
}
info!("Starting {} http workers", self.threads);
workers
}
} }
impl<H: HttpHandler> HttpServer<TcpStream, net::SocketAddr, H> { impl<H: HttpHandler, U, V> HttpServer<TcpStream, net::SocketAddr, H, U>
where U: IntoIterator<Item=V> + 'static,
V: IntoHttpHandler<Handler=H>,
{
/// Start listening for incomming connections. /// Start listening for incomming connections.
/// ///
/// This methods converts address to list of `SocketAddr` /// This methods converts address to list of `SocketAddr`
/// then binds to all available addresses. /// then binds to all available addresses.
/// It also starts number of http handler workers in seperate threads.
/// For each address this method starts separate thread which does `accept()` in a loop.
pub fn serve<S, Addr>(mut self, addr: S) -> io::Result<Addr> pub fn serve<S, Addr>(mut self, addr: S) -> io::Result<Addr>
where Self: ActorAddress<Self, Addr>, where Self: ActorAddress<Self, Addr>,
S: net::ToSocketAddrs, S: net::ToSocketAddrs,
{ {
let addrs = self.bind(addr)?; let addrs = self.bind(addr)?;
// set server settings
let settings = ServerSettings::new(Some(addrs[0].0), false); let settings = ServerSettings::new(Some(addrs[0].0), false);
for h in Rc::get_mut(&mut self.h).unwrap().iter_mut() { let workers = self.start_workers(&settings);
h.server_settings(settings.clone());
// start acceptors threads
for (addr, sock) in addrs {
let wrks = workers.clone();
let _ = thread::Builder::new().name(format!("Accept on {}", addr)).spawn(move || {
let mut next = 0;
loop {
match sock.accept() {
Ok((socket, addr)) => {
let addr = if let Some(addr) = addr.as_inet() {
net::SocketAddr::V4(addr)
} else {
net::SocketAddr::V6(addr.as_inet6().unwrap())
};
let msg = IoStream{
io: socket.into_tcp_stream(), peer: Some(addr), http2: false};
wrks[next].unbounded_send(msg).expect("worker thread died");
next = (next + 1) % wrks.len();
}
Err(err) => error!("Error accepting connection: {:?}", err),
}
}
});
info!("Starting http server on {}", addr);
} }
// start server // start http server actor
Ok(HttpServer::create(move |ctx| { Ok(HttpServer::create(|_| {self}))
for (addr, tcp) in addrs {
info!("Starting http server on {}", addr);
ctx.add_stream(tcp.incoming().map(
move |(t, a)| IoStream{io: t, peer: Some(a), http2: false}));
}
self
}))
} }
} }
#[cfg(feature="tls")] #[cfg(feature="tls")]
impl<H: HttpHandler> HttpServer<TlsStream<TcpStream>, net::SocketAddr, H> { impl<H: HttpHandler, U, V> HttpServer<TlsStream<TcpStream>, net::SocketAddr, H, U>
where U: IntoIterator<Item=V> + 'static,
V: IntoHttpHandler<Handler=H>,
{
/// Start listening for incomming tls connections. /// Start listening for incomming tls connections.
/// ///
/// This methods converts address to list of `SocketAddr` /// This methods converts address to list of `SocketAddr`
/// then binds to all available addresses. /// then binds to all available addresses.
pub fn serve_tls<S, Addr>(mut self, addr: S, pkcs12: ::Pkcs12) -> io::Result<Addr> pub fn serve_tls<S, Addr>(self, addr: S, pkcs12: ::Pkcs12) -> io::Result<Addr>
where Self: ActorAddress<Self, Addr>, where Self: ActorAddress<Self, Addr>,
S: net::ToSocketAddrs, S: net::ToSocketAddrs,
{ {
let addrs = self.bind(addr)?; let addrs = self.bind(addr)?;
let settings = ServerSettings::new(Some(addrs[0].0), false);
// set server settings
let settings = ServerSettings::new(Some(addrs[0].0), true);
for h in Rc::get_mut(&mut self.h).unwrap().iter_mut() {
h.server_settings(settings.clone());
}
let acceptor = match TlsAcceptor::builder(pkcs12) { let acceptor = match TlsAcceptor::builder(pkcs12) {
Ok(builder) => { Ok(builder) => {
match builder.build() { match builder.build() {
Ok(acceptor) => Rc::new(acceptor), Ok(acceptor) => acceptor,
Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err)) Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err))
} }
} }
Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err)) Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err))
}; };
// start server // start workers
Ok(HttpServer::create(move |ctx| { let mut workers = Vec::new();
for (srv, tcp) in addrs { for _ in 0..self.threads {
info!("Starting tls http server on {}", srv); let s = settings.clone();
let (tx, rx) = mpsc::unbounded::<IoStream<net::TcpStream>>();
let acc = acceptor.clone(); let acc = acceptor.clone();
ctx.add_stream(tcp.incoming().and_then(move |(stream, addr)| { let factory = Arc::clone(&self.factory);
TlsAcceptorExt::accept_async(acc.as_ref(), stream) let _addr = Arbiter::start(move |ctx: &mut Context<_>| {
.map(move |t| IoStream{io: t, peer: Some(addr), http2: false}) let mut apps: Vec<_> = (*factory)()
.map_err(|err| { .into_iter().map(|h| h.into_handler()).collect();
trace!("Error during handling tls connection: {}", err); for app in &mut apps {
io::Error::new(io::ErrorKind::Other, err) app.server_settings(s.clone());
}) }
})); ctx.add_stream(rx);
} TlsWorker{h: Rc::new(apps), acceptor: acc}
self });
})) workers.push(tx);
// self.workers.push(addr);
}
info!("Starting {} http workers", self.threads);
// start acceptors threads
for (addr, sock) in addrs {
let wrks = workers.clone();
let _ = thread::Builder::new().name(format!("Accept on {}", addr)).spawn(move || {
let mut next = 0;
loop {
match sock.accept() {
Ok((socket, addr)) => {
let addr = if let Some(addr) = addr.as_inet() {
net::SocketAddr::V4(addr)
} else {
net::SocketAddr::V6(addr.as_inet6().unwrap())
};
let msg = IoStream{
io: socket.into_tcp_stream(), peer: Some(addr), http2: false};
wrks[next].unbounded_send(msg).expect("worker thread died");
next = (next + 1) % wrks.len();
}
Err(err) => error!("Error accepting connection: {:?}", err),
}
}
});
info!("Starting tls http server on {}", addr);
}
// start http server actor
Ok(HttpServer::create(|_| {self}))
} }
} }
#[cfg(feature="alpn")] #[cfg(feature="alpn")]
impl<H: HttpHandler> HttpServer<SslStream<TcpStream>, net::SocketAddr, H> { impl<H: HttpHandler, U, V> HttpServer<SslStream<TcpStream>, net::SocketAddr, H, U>
where U: IntoIterator<Item=V> + 'static,
V: IntoHttpHandler<Handler=H>,
{
/// Start listening for incomming tls connections. /// Start listening for incomming tls connections.
/// ///
/// This methods converts address to list of `SocketAddr` /// This methods converts address to list of `SocketAddr`
/// then binds to all available addresses. /// then binds to all available addresses.
pub fn serve_tls<S, Addr>(mut self, addr: S, identity: ParsedPkcs12) -> io::Result<Addr> pub fn serve_tls<S, Addr>(self, addr: S, identity: &ParsedPkcs12) -> io::Result<Addr>
where Self: ActorAddress<Self, Addr>, where Self: ActorAddress<Self, Addr>,
S: net::ToSocketAddrs, S: net::ToSocketAddrs,
{ {
let addrs = self.bind(addr)?; let addrs = self.bind(addr)?;
let settings = ServerSettings::new(Some(addrs[0].0), false);
// set server settings
let settings = ServerSettings::new(Some(addrs[0].0), true);
for h in Rc::get_mut(&mut self.h).unwrap().iter_mut() {
h.server_settings(settings.clone());
}
let acceptor = match SslAcceptorBuilder::mozilla_intermediate( let acceptor = match SslAcceptorBuilder::mozilla_intermediate(
SslMethod::tls(), &identity.pkey, &identity.cert, &identity.chain) SslMethod::tls(), &identity.pkey, &identity.cert, &identity.chain)
{ {
Ok(mut builder) => { Ok(mut builder) => {
match builder.builder_mut().set_alpn_protocols(&[b"h2", b"http/1.1"]) { match builder.set_alpn_protocols(&[b"h2", b"http/1.1"]) {
Ok(_) => builder.build(), Ok(_) => builder.build(),
Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err)), Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err)),
} }
@ -268,55 +386,80 @@ impl<H: HttpHandler> HttpServer<SslStream<TcpStream>, net::SocketAddr, H> {
Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err)) Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err))
}; };
Ok(HttpServer::create(move |ctx| { // start workers
for (srv, tcp) in addrs { let mut workers = Vec::new();
info!("Starting tls http server on {}", srv); for _ in 0..self.threads {
let s = settings.clone();
let (tx, rx) = mpsc::unbounded::<IoStream<net::TcpStream>>();
let acc = acceptor.clone(); let acc = acceptor.clone();
ctx.add_stream(tcp.incoming().and_then(move |(stream, addr)| { let factory = Arc::clone(&self.factory);
SslAcceptorExt::accept_async(&acc, stream) let _addr = Arbiter::start(move |ctx: &mut Context<_>| {
.map(move |stream| { let mut apps: Vec<_> = (*factory)()
let http2 = if let Some(p) = .into_iter().map(|h| h.into_handler()).collect();
stream.get_ref().ssl().selected_alpn_protocol() for app in &mut apps {
{ app.server_settings(s.clone());
p.len() == 2 && &p == b"h2" }
ctx.add_stream(rx);
AlpnWorker{h: Rc::new(apps), acceptor: acc}
});
workers.push(tx);
// self.workers.push(addr);
}
info!("Starting {} http workers", self.threads);
// start acceptors threads
for (addr, sock) in addrs {
let wrks = workers.clone();
let _ = thread::Builder::new().name(format!("Accept on {}", addr)).spawn(move || {
let mut next = 0;
loop {
match sock.accept() {
Ok((socket, addr)) => {
let addr = if let Some(addr) = addr.as_inet() {
net::SocketAddr::V4(addr)
} else { } else {
false net::SocketAddr::V6(addr.as_inet6().unwrap())
}; };
IoStream{io: stream, peer: Some(addr), http2: http2} let msg = IoStream{
}) io: socket.into_tcp_stream(), peer: Some(addr), http2: false};
.map_err(|err| { wrks[next].unbounded_send(msg).expect("worker thread died");
trace!("Error during handling tls connection: {}", err); next = (next + 1) % wrks.len();
io::Error::new(io::ErrorKind::Other, err) }
}) Err(err) => error!("Error accepting connection: {:?}", err),
})); }
} }
self });
})) info!("Starting tls http server on {}", addr);
}
// start http server actor
Ok(HttpServer::create(|_| {self}))
} }
} }
struct IoStream<T> { struct IoStream<T> {
io: T, io: T,
peer: Option<SocketAddr>, peer: Option<net::SocketAddr>,
http2: bool, http2: bool,
} }
impl<T> ResponseType for IoStream<T> impl<T> ResponseType for IoStream<T>
where T: AsyncRead + AsyncWrite + 'static
{ {
type Item = (); type Item = ();
type Error = (); type Error = ();
} }
impl<T, A, H> StreamHandler<IoStream<T>, io::Error> for HttpServer<T, A, H> impl<T, A, H, U> StreamHandler<IoStream<T>, io::Error> for HttpServer<T, A, H, U>
where T: AsyncRead + AsyncWrite + 'static, where T: AsyncRead + AsyncWrite + 'static,
H: HttpHandler + 'static, H: HttpHandler + 'static,
U: 'static,
A: 'static {} A: 'static {}
impl<T, A, H> Handler<IoStream<T>, io::Error> for HttpServer<T, A, H> impl<T, A, H, U> Handler<IoStream<T>, io::Error> for HttpServer<T, A, H, U>
where T: AsyncRead + AsyncWrite + 'static, where T: AsyncRead + AsyncWrite + 'static,
H: HttpHandler + 'static, H: HttpHandler + 'static,
U: 'static,
A: 'static, A: 'static,
{ {
fn error(&mut self, err: io::Error, _: &mut Context<Self>) { fn error(&mut self, err: io::Error, _: &mut Context<Self>) {
@ -331,3 +474,135 @@ impl<T, A, H> Handler<IoStream<T>, io::Error> for HttpServer<T, A, H>
Self::empty() Self::empty()
} }
} }
/// Http workers
///
/// Worker accepts Socket objects via unbounded channel and start requests processing.
struct Worker<H> {
h: Rc<Vec<H>>,
}
impl<H: 'static> Actor for Worker<H> {
type Context = Context<Self>;
}
impl<H> StreamHandler<IoStream<net::TcpStream>> for Worker<H>
where H: HttpHandler + 'static {}
impl<H> Handler<IoStream<net::TcpStream>> for Worker<H>
where H: HttpHandler + 'static,
{
fn handle(&mut self, msg: IoStream<net::TcpStream>, _: &mut Context<Self>)
-> Response<Self, IoStream<net::TcpStream>>
{
let io = TcpStream::from_stream(msg.io, Arbiter::handle())
.expect("failed to associate TCP stream");
Arbiter::handle().spawn(
HttpChannel::new(Rc::clone(&self.h), io, msg.peer, msg.http2));
Self::empty()
}
}
/// Tls http workers
///
/// Worker accepts Socket objects via unbounded channel and start requests processing.
#[cfg(feature="tls")]
struct TlsWorker<H> {
h: Rc<Vec<H>>,
acceptor: TlsAcceptor,
}
#[cfg(feature="tls")]
impl<H: 'static> Actor for TlsWorker<H> {
type Context = Context<Self>;
}
#[cfg(feature="tls")]
impl<H> StreamHandler<IoStream<net::TcpStream>> for TlsWorker<H>
where H: HttpHandler + 'static {}
#[cfg(feature="tls")]
impl<H> Handler<IoStream<net::TcpStream>> for TlsWorker<H>
where H: HttpHandler + 'static,
{
fn handle(&mut self, msg: IoStream<net::TcpStream>, _: &mut Context<Self>)
-> Response<Self, IoStream<net::TcpStream>>
{
let IoStream { io, peer, http2 } = msg;
let io = TcpStream::from_stream(io, Arbiter::handle())
.expect("failed to associate TCP stream");
let h = Rc::clone(&self.h);
Arbiter::handle().spawn(
TlsAcceptorExt::accept_async(&self.acceptor, io).then(move |res| {
match res {
Ok(io) => Arbiter::handle().spawn(
HttpChannel::new(h, io, peer, http2)),
Err(err) =>
trace!("Error during handling tls connection: {}", err),
};
future::result(Ok(()))
})
);
Self::empty()
}
}
/// Tls http workers with alpn support
///
/// Worker accepts Socket objects via unbounded channel and start requests processing.
#[cfg(feature="alpn")]
struct AlpnWorker<H> {
h: Rc<Vec<H>>,
acceptor: SslAcceptor,
}
#[cfg(feature="alpn")]
impl<H: 'static> Actor for AlpnWorker<H> {
type Context = Context<Self>;
}
#[cfg(feature="alpn")]
impl<H> StreamHandler<IoStream<net::TcpStream>> for AlpnWorker<H>
where H: HttpHandler + 'static {}
#[cfg(feature="alpn")]
impl<H> Handler<IoStream<net::TcpStream>> for AlpnWorker<H>
where H: HttpHandler + 'static,
{
fn handle(&mut self, msg: IoStream<net::TcpStream>, _: &mut Context<Self>)
-> Response<Self, IoStream<net::TcpStream>>
{
let IoStream { io, peer, .. } = msg;
let io = TcpStream::from_stream(io, Arbiter::handle())
.expect("failed to associate TCP stream");
let h = Rc::clone(&self.h);
Arbiter::handle().spawn(
SslAcceptorExt::accept_async(&self.acceptor, io).then(move |res| {
match res {
Ok(io) => {
let http2 = if let Some(p) = io.get_ref().ssl().selected_alpn_protocol()
{
p.len() == 2 && &p == b"h2"
} else {
false
};
Arbiter::handle().spawn(
HttpChannel::new(h, io, peer, http2));
},
Err(err) =>
trace!("Error during handling tls connection: {}", err),
};
future::result(Ok(()))
})
);
Self::empty()
}
}

View File

@ -4,7 +4,6 @@ extern crate tokio_core;
extern crate reqwest; extern crate reqwest;
use std::{net, thread}; use std::{net, thread};
use std::rc::Rc;
use std::sync::Arc; use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::atomic::{AtomicUsize, Ordering};
use tokio_core::net::TcpListener; use tokio_core::net::TcpListener;
@ -52,7 +51,6 @@ struct MiddlewareTest {
start: Arc<AtomicUsize>, start: Arc<AtomicUsize>,
response: Arc<AtomicUsize>, response: Arc<AtomicUsize>,
finish: Arc<AtomicUsize>, finish: Arc<AtomicUsize>,
test: Rc<usize>,
} }
impl<S> middlewares::Middleware<S> for MiddlewareTest { impl<S> middlewares::Middleware<S> for MiddlewareTest {
@ -89,7 +87,7 @@ fn test_middlewares() {
move || vec![Application::new() move || vec![Application::new()
.middleware(MiddlewareTest{start: act_num1.clone(), .middleware(MiddlewareTest{start: act_num1.clone(),
response: act_num2.clone(), response: act_num2.clone(),
finish: act_num3.clone(), test: Rc::new(1)}) finish: act_num3.clone()})
.resource("/", |r| r.method(Method::GET).h(httpcodes::HTTPOk))]) .resource("/", |r| r.method(Method::GET).h(httpcodes::HTTPOk))])
.serve::<_, ()>("127.0.0.1:58904").unwrap(); .serve::<_, ()>("127.0.0.1:58904").unwrap();
sys.run(); sys.run();