vbrandl/hoc
1
0
Fork 0
Code Issues 1 Pull Requests Actions Projects Releases Wiki Activity

Migrate to config v0.12.0
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Valentin Brandl 2022-02-26 16:22:36 +01:00
parent 0a518ab331
commit 84f4aa9be3
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/config.rs
View File

@ -18,21 +18,16 @@ pub struct Settings {
} }
impl Settings { impl Settings {
#[deprecated]
pub fn new() -> Result<Self, ConfigError> {
Self::load()
}
pub fn load() -> Result<Self, ConfigError> { pub fn load() -> Result<Self, ConfigError> {
let mut config = Config::new(); Config::builder()
config .add_source(File::with_name("hoc.toml").required(false))
.merge(File::with_name("hoc.toml").required(false))? .add_source(Environment::with_prefix("hoc"))
.merge(Environment::with_prefix("hoc"))?
.set_default("repodir", "./repos")? .set_default("repodir", "./repos")?
.set_default("cachedir", "./cache")? .set_default("cachedir", "./cache")?
.set_default("workers", 4)? .set_default("workers", 4)?
.set_default("port", 8080)? .set_default("port", 8080)?
.set_default("host", "0.0.0.0")?; .set_default("host", "0.0.0.0")?
config.try_into() .build()?
.try_deserialize()
} }
} }