Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify config file loading

Browse source
This commit is contained in:
Joscha 2023-08-16 22:31:56 +02:00
parent ad69babf59
commit 225250ed4e
1 changed files with 13 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/config.rs
View file

@ -18,73 +18,32 @@ use crate::{
id, somehow, id, somehow,
}; };
mod default {
use std::{net::SocketAddr, time::Duration};
pub fn web_base() -> String {
"/".to_string()
}
pub fn web_address() -> SocketAddr {
// Port chosen by fair dice roll
"[::1]:8221".parse().unwrap()
}
pub fn web_worker_timeout() -> Duration {
Duration::from_secs(60)
}
pub fn web_worker_max_upload() -> usize {
1024 * 1024 * 8 // 8 MiB
}
pub fn repo_update_delay() -> Duration {
Duration::from_secs(60)
}
pub fn worker_ping_delay() -> Duration {
Duration::from_secs(10)
}
pub fn worker_batch_duration() -> Duration {
Duration::from_secs(60 * 10)
}
}
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[serde(default)]
struct Web { struct Web {
#[serde(default = "default::web_base")]
base: String, base: String,
#[serde(default = "default::web_address")]
address: SocketAddr, address: SocketAddr,
worker_token: Option<String>, worker_token: Option<String>,
#[serde(default = "default::web_worker_timeout")]
worker_timeout: Duration, worker_timeout: Duration,
#[serde(default = "default::web_worker_max_upload")]
worker_max_upload: usize, worker_max_upload: usize,
} }
impl Default for Web { impl Default for Web {
fn default() -> Self { fn default() -> Self {
Self { Self {
base: default::web_base(), base: "/".to_string(),
address: default::web_address(), address: "[::1]:8221".parse().unwrap(), // Port chosen by fair dice roll
worker_token: None, worker_token: None,
worker_timeout: default::web_worker_timeout(), worker_timeout: Duration::from_secs(60),
worker_max_upload: default::web_worker_max_upload(), worker_max_upload: 1024 * 1024 * 8, // 8 MiB
} }
} }
} }
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[serde(default)]
struct Repo { struct Repo {
name: Option<String>, name: Option<String>,
#[serde(default = "default::repo_update_delay", with = "humantime_serde")]
update_delay: Duration, update_delay: Duration,
} }
@ -92,7 +51,7 @@ impl Default for Repo {
fn default() -> Self { fn default() -> Self {
Self { Self {
name: None, name: None,
update_delay: default::repo_update_delay(), update_delay: Duration::from_secs(60),
} }
} }
} }
@ -104,13 +63,14 @@ struct WorkerServer {
} }
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[serde(default)]
struct Worker { struct Worker {
name: Option<String>, name: Option<String>,
#[serde(default = "default::worker_ping_delay", with = "humantime_serde")] #[serde(with = "humantime_serde")]
ping_delay: Duration, ping_delay: Duration,
#[serde(default = "default::worker_batch_duration", with = "humantime_serde")] #[serde(with = "humantime_serde")]
batch_duration: Duration, batch_duration: Duration,
servers: HashMap<String, WorkerServer>, servers: HashMap<String, WorkerServer>,
@ -120,22 +80,18 @@ impl Default for Worker {
fn default() -> Self { fn default() -> Self {
Self { Self {
name: None, name: None,
ping_delay: default::worker_ping_delay(), ping_delay: Duration::from_secs(10),
batch_duration: default::worker_batch_duration(), batch_duration: Duration::from_secs(60 * 10),
servers: HashMap::new(), servers: HashMap::new(),
} }
} }
} }
#[derive(Debug, Default, Deserialize)] #[derive(Debug, Default, Deserialize)]
#[serde(default)]
struct ConfigFile { struct ConfigFile {
#[serde(default)]
web: Web, web: Web,
#[serde(default)]
repo: Repo, repo: Repo,
#[serde(default)]
worker: Worker, worker: Worker,
} }