feat(server): re-design Server as higher-level API
The `hyper::Server` is now a proper higher-level API for running HTTP servers. There is a related `hyper::server::Builder` type, to construct a `Server`. All other types (`Http`, `Serve`, etc) were moved into the "lower-level" `hyper::server::conn` module. The `Server` is a `Future` representing a listening HTTP server. Options needed to build one are set on the `Builder`. As `Server` is just a `Future`, it no longer owns a thread-blocking executor, and can thus be run next to other servers, clients, or what-have-you. Closes #1322 Closes #1263 BREAKING CHANGE: The `Server` is no longer created from `Http::bind`, nor is it `run`. It is a `Future` that must be polled by an `Executor`. The `hyper::server::Http` type has move to `hyper::server::conn::Http`.
This commit is contained in:
@@ -9,7 +9,7 @@ use futures::future::lazy;
|
||||
|
||||
use hyper::{Body, Chunk, Client, Method, Request, Response, StatusCode};
|
||||
use hyper::client::HttpConnector;
|
||||
use hyper::server::{Http, Service};
|
||||
use hyper::server::{Server, Service};
|
||||
|
||||
#[allow(unused, deprecated)]
|
||||
use std::ascii::AsciiExt;
|
||||
@@ -75,15 +75,17 @@ impl Service for ResponseExamples {
|
||||
|
||||
fn main() {
|
||||
pretty_env_logger::init();
|
||||
|
||||
let addr = "127.0.0.1:1337".parse().unwrap();
|
||||
|
||||
tokio::run(lazy(move || {
|
||||
let client = Client::new();
|
||||
let serve = Http::new().serve_addr(&addr, move || Ok(ResponseExamples(client.clone()))).unwrap();
|
||||
println!("Listening on http://{} with 1 thread.", serve.incoming_ref().local_addr());
|
||||
let server = Server::bind(&addr)
|
||||
.serve(move || Ok(ResponseExamples(client.clone())))
|
||||
.map_err(|e| eprintln!("server error: {}", e));
|
||||
|
||||
serve.map_err(|_| ()).for_each(move |conn| {
|
||||
tokio::spawn(conn.map_err(|err| println!("serve error: {:?}", err)))
|
||||
})
|
||||
println!("Listening on http://{}", addr);
|
||||
|
||||
server
|
||||
}));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user