X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fmain.rs;h=c4c51a0ddfc0ed859c93e1d8c4597d7d4859a09a;hb=c4620d6f981e84059c464604969a55ff085152f6;hp=a71142722207a239cbd3e7e8ac07e793c331d4ef;hpb=fcb206d160d2588d5210d605191de78120a25879;p=valheim_web.git diff --git a/backend/src/main.rs b/backend/src/main.rs index a711427..c4c51a0 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -1,14 +1,10 @@ - -extern crate listenfd; extern crate askama; -// use futures::sink::With; -use listenfd::ListenFd; +use std::{ sync::Mutex, env::args, fs::File, io::prelude::* }; + use actix_files as fs; use actix_web::{ get, web, Responder, middleware, App, HttpServer }; use askama::Template; - -use std::{ sync::Mutex, env::args, fs::File, io::prelude::* }; use ron::{ de::from_reader, ser::{ to_string_pretty, PrettyConfig } }; use serde::{ Deserialize, Serialize }; @@ -55,7 +51,7 @@ struct Config { world_path: String, } -fn empty_string() -> String { "".to_string() } +fn empty_string() -> String { "".to_owned() } impl Config { fn default() -> Self { @@ -95,8 +91,7 @@ async fn main() -> std::io::Result<()> { let config_shared = web::Data::new(Mutex::new(config)); - let mut listenfd = ListenFd::from_env(); - let mut server = + let server = HttpServer::new( move || { App::new() @@ -106,14 +101,9 @@ async fn main() -> std::io::Result<()> { .service(main_page) .service(fs::Files::new("/static", "static").show_files_listing()) } - ); - - server = - if let Some(l) = listenfd.take_tcp_listener(0).unwrap() { - server.listen(l).unwrap() - } else { - server.bind(&format!("0.0.0.0:{}", port)).unwrap() - }; + ) + .bind(&format!("0.0.0.0:{}", port)) + .unwrap(); server.run().await }