diff --git a/src/config.rs b/src/config.rs index 55b9934..de45213 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,6 +1,6 @@ //! Configuration from a file. -use std::{fs, io::ErrorKind, path::Path, time::Duration}; +use std::{fs, io::ErrorKind, net::SocketAddr, path::Path, time::Duration}; use serde::Deserialize; use tracing::{debug, info}; @@ -8,12 +8,17 @@ use tracing::{debug, info}; use crate::somehow; mod default { - use std::time::Duration; + use std::{net::SocketAddr, time::Duration}; pub fn web_base() -> String { "".to_string() } + pub fn web_address() -> SocketAddr { + // Port chosen by fair dice roll + "[::]:8221".parse().unwrap() + } + pub fn repo_name() -> String { "local repo".to_string() } @@ -27,12 +32,15 @@ mod default { pub struct Web { #[serde(default = "default::web_base")] pub base: String, + #[serde(default = "default::web_address")] + pub address: SocketAddr, } impl Default for Web { fn default() -> Self { Self { base: default::web_base(), + address: default::web_address(), } } } @@ -86,9 +94,10 @@ impl ConfigFile { } pub struct Config { + pub web_base: String, + pub web_address: SocketAddr, pub repo_name: String, pub repo_update_delay: Duration, - pub web_base: String, } impl Config { @@ -100,9 +109,10 @@ impl Config { let web_base = config_file.web_base(); Ok(Self { + web_base, + web_address: config_file.web.address, repo_name: config_file.repo.name, repo_update_delay: config_file.repo.update_delay, - web_base, }) } } diff --git a/src/server/recurring.rs b/src/server/recurring.rs index 32db6b7..62252a7 100644 --- a/src/server/recurring.rs +++ b/src/server/recurring.rs @@ -28,9 +28,9 @@ async fn recurring_task(state: &Server) { .await; } -pub async fn run(state: Server) { +pub async fn run(server: Server) { loop { - recurring_task(&state).await; - tokio::time::sleep(state.config.repo_update_delay).await; + recurring_task(&server).await; + tokio::time::sleep(server.config.repo_update_delay).await; } } diff --git a/src/server/web.rs b/src/server/web.rs index 40f1dab..5442be7 100644 --- a/src/server/web.rs +++ b/src/server/web.rs @@ -39,7 +39,7 @@ impl Base { } } -pub async fn run(state: Server) -> somehow::Result<()> { +pub async fn run(server: Server) -> somehow::Result<()> { // TODO Add text body to body-less status codes let app = Router::new() @@ -50,9 +50,9 @@ pub async fn run(state: Server) -> somehow::Result<()> { .route("/queue/table", get(queue::get_table)) .route("/queue/:id", get(queue_id::get)) .fallback(get(r#static::static_handler)) - .with_state(state.clone()); + .with_state(server.clone()); - axum::Server::bind(&"0.0.0.0:8000".parse().unwrap()) + axum::Server::bind(&server.config.web_address) .serve(app.into_make_service()) .await?;