1
0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 06:39:22 +02:00

do not re-export HttpServer from server module

This commit is contained in:
Nikolay Kim
2018-04-06 08:40:11 -07:00
parent 12586db15c
commit 2dafd9c681
21 changed files with 47 additions and 47 deletions

View File

@ -8,8 +8,8 @@ extern crate futures;
use futures::Stream;
use std::{io, env};
use actix_web::{error, fs, pred,
App, HttpRequest, HttpResponse, HttpServer, Result, Error};
use actix_web::{error, fs, pred, server,
App, HttpRequest, HttpResponse, Result, Error};
use actix_web::http::{Method, StatusCode};
use actix_web::middleware::{self, RequestSession};
use futures::future::{FutureResult, result};
@ -99,7 +99,7 @@ fn main() {
env_logger::init();
let sys = actix::System::new("basic-example");
let addr = HttpServer::new(
let addr = server::new(
|| App::new()
// enable logger
.middleware(middleware::Logger::default())

View File

@ -4,9 +4,10 @@ extern crate futures;
extern crate env_logger;
use futures::{Future, Stream};
use actix_web::{client, server, middleware,
App, AsyncResponder, Body,
HttpRequest, HttpResponse, HttpMessage, Error};
use actix_web::{
client, server, middleware,
App, AsyncResponder, Body, HttpRequest, HttpResponse, HttpMessage, Error};
/// Stream client request response and then send body to a server response
fn index(_req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> {
@ -44,7 +45,7 @@ fn main() {
env_logger::init();
let sys = actix::System::new("http-proxy");
let _addr = server::new(
server::new(
|| App::new()
.middleware(middleware::Logger::default())
.resource("/streaming", |r| r.f(streaming))

View File

@ -89,7 +89,7 @@ fn main() {
env_logger::init();
let sys = actix::System::new("json-example");
let _ = server::new(|| {
server::new(|| {
App::new()
// enable logger
.middleware(middleware::Logger::default())

View File

@ -94,7 +94,7 @@ fn main() {
});
// Start http server
let _ = server::new(move || {
server::new(move || {
App::with_state(AppState{executor: addr.clone()})
// enable logger
.middleware(middleware::Logger::default())

View File

@ -49,7 +49,7 @@ fn main() {
let _ = env_logger::init();
let sys = actix::System::new("multipart-example");
let _ = server::new(
server::new(
|| App::new()
.middleware(middleware::Logger::default()) // <- logger
.resource("/multipart", |r| r.method(http::Method::POST).a(index)))

View File

@ -44,7 +44,7 @@ fn main() {
env_logger::init();
let sys = actix::System::new("protobuf-example");
let _ = server::new(|| {
server::new(|| {
App::new()
.middleware(middleware::Logger::default())
.resource("/", |r| r.method(http::Method::POST).f(index))})

View File

@ -53,7 +53,7 @@ fn main() {
let addr = SyncArbiter::start(3, move || DbExecutor(pool.clone()));
// Start http server
let _ = server::new(move || {
server::new(move || {
App::with_state(State{db: addr.clone()})
// enable logger
.middleware(middleware::Logger::default())

View File

@ -55,10 +55,10 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for MyWebSocket {
fn main() {
::std::env::set_var("RUST_LOG", "actix_web=info");
let _ = env_logger::init();
env_logger::init();
let sys = actix::System::new("ws-example");
let _ = server::new(
server::new(
|| App::with_state(AppState{counter: Cell::new(0)})
// enable logger
.middleware(middleware::Logger::default())

View File

@ -30,10 +30,10 @@ fn index(req: HttpRequest<State>) -> Result<HttpResponse, Error> {
fn main() {
::std::env::set_var("RUST_LOG", "actix_web=info");
let _ = env_logger::init();
env_logger::init();
let sys = actix::System::new("tera-example");
let _ = server::new(|| {
server::new(|| {
let tera = compile_templates!(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*"));
App::with_state(State{template: tera})

View File

@ -29,7 +29,7 @@ fn main() {
builder.set_private_key_file("key.pem", SslFiletype::PEM).unwrap();
builder.set_certificate_chain_file("cert.pem").unwrap();
let _ = server::new(
server::new(
|| App::new()
// enable logger
.middleware(middleware::Logger::default())

View File

@ -4,7 +4,7 @@ extern crate env_logger;
extern crate tokio_uds;
use actix::*;
use actix_web::*;
use actix_web::{middleware, server, App, HttpRequest};
use tokio_uds::UnixListener;
@ -19,7 +19,7 @@ fn main() {
let listener = UnixListener::bind(
"/tmp/actix-uds.socket", Arbiter::handle()).expect("bind failed");
HttpServer::new(
server::new(
|| App::new()
// enable logger
.middleware(middleware::Logger::default())

View File

@ -17,7 +17,7 @@ extern crate actix_web;
use std::time::Instant;
use actix::*;
use actix_web::{http, fs, ws, App, HttpRequest, HttpResponse, HttpServer, Error};
use actix_web::{http, fs, ws, server::HttpServer, App, HttpRequest, HttpResponse, Error};
mod codec;
mod server;
@ -183,7 +183,7 @@ fn main() {
}));
// Create Http server with websocket support
let addr = HttpServer::new(
HttpServer::new(
move || {
// Websocket sessions state
let state = WsChatSessionState { addr: server.clone() };

View File

@ -45,7 +45,7 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for MyWebSocket {
fn main() {
::std::env::set_var("RUST_LOG", "actix_web=info");
let _ = env_logger::init();
env_logger::init();
let sys = actix::System::new("ws-example");
server::new(