diff options
author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2019-04-09 20:25:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-09 20:25:21 +0000 |
commit | 742d058decb336f081dafde5aea7dd0f7bcb7cf5 (patch) | |
tree | 8db01dc1916f7b4830015ff18f5fcdd2b4ebb25b /src/main.rs | |
parent | Bump deps (diff) | |
parent | Replace format with to_string() (diff) | |
download | miniserve-742d058decb336f081dafde5aea7dd0f7bcb7cf5.tar.gz miniserve-742d058decb336f081dafde5aea7dd0f7bcb7cf5.zip |
Merge pull request #60 from vojta7/bug_fixes
Bug fixes
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/main.rs b/src/main.rs index a703b00..fce9cf6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -84,33 +84,6 @@ fn main() { let sys = actix::System::new("miniserve"); let inside_config = miniserve_config.clone(); - server::new(move || { - App::with_state(inside_config.clone()) - .middleware(auth::Auth) - .middleware(middleware::Logger::default()) - .configure(configure_app) - }) - .bind( - miniserve_config - .interfaces - .iter() - .map(|interface| { - format!( - "{interface}:{port}", - interface = &interface, - port = miniserve_config.port, - ) - .to_socket_addrs() - .unwrap() - .next() - .unwrap() - }) - .collect::<Vec<SocketAddr>>() - .as_slice(), - ) - .expect("Couldn't bind server") - .shutdown_timeout(0) - .start(); let interfaces = miniserve_config.interfaces.iter().map(|&interface| { if interface == IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)) { @@ -181,6 +154,33 @@ fn main() { ); println!("\nQuit by pressing CTRL-C"); + server::new(move || { + App::with_state(inside_config.clone()) + .middleware(auth::Auth) + .middleware(middleware::Logger::default()) + .configure(configure_app) + }) + .bind( + miniserve_config + .interfaces + .iter() + .map(|interface| { + format!( + "{interface}:{port}", + interface = &interface, + port = miniserve_config.port, + ) + .to_socket_addrs() + .unwrap() + .next() + .unwrap() + }) + .collect::<Vec<SocketAddr>>() + .as_slice(), + ) + .expect("Couldn't bind server") + .shutdown_timeout(0) + .start(); let _ = sys.run(); } |