diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/makefile | 2 | ||||
| -rw-r--r-- | server/src/main.rs | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/server/makefile b/server/makefile index 6299482..6097a10 100644 --- a/server/makefile +++ b/server/makefile @@ -5,5 +5,7 @@ run: cargo +nightly run --release watch: systemfd --no-pid -s http::8080 -- cargo watch -x '+nightly run' +watch-public: + systemfd --no-pid -s http::0.0.0.0:8080 -- cargo watch -x '+nightly run' target/release/keks-meet: $(shell find src) Cargo.toml cargo +nightly build --release diff --git a/server/src/main.rs b/server/src/main.rs index 85f1854..413f23a 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -12,6 +12,8 @@ use log::{debug, error}; use room::Room; use std::collections::HashMap; use std::convert::Infallible; +use std::net::SocketAddr; +use std::str::FromStr; use std::sync::Arc; use tokio::sync::RwLock; use warp::hyper::Server; @@ -69,13 +71,8 @@ async fn run() { Server::from_tcp(l).unwrap() } else { Server::bind( - &( - [127, 0, 0, 1], - std::env::var("PORT") - .map(|p| p.parse().unwrap()) - .unwrap_or(8080), - ) - .into(), + &SocketAddr::from_str(&std::env::var("BIND").unwrap_or(String::from("127.0.0.1:8080"))) + .unwrap(), ) }; let service = warp::service(routes); |