gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Crash if config fails to load (#1545) 

* Crash if config fails to load

* fix previous commit
ansible-overwrite-config
Nutomic 2021-04-05 14:23:32 +00:00 committed by GitHub
parent ebb980eaaf
commit f0c96c28bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/utils/src/settings/mod.rs
View File

@ -13,7 +13,6 @@ use crate::{
}; };
use anyhow::{anyhow, Context}; use anyhow::{anyhow, Context};
use deser_hjson::from_str; use deser_hjson::from_str;
use log::warn;
use merge::Merge; use merge::Merge;
use std::{env, fs, io::Error, net::IpAddr, sync::RwLock}; use std::{env, fs, io::Error, net::IpAddr, sync::RwLock};
@ -23,16 +22,8 @@ pub mod structs;
static CONFIG_FILE: &str = "config/config.hjson"; static CONFIG_FILE: &str = "config/config.hjson";
lazy_static! { lazy_static! {
static ref SETTINGS: RwLock<Settings> = RwLock::new(match Settings::init() { static ref SETTINGS: RwLock<Settings> =
Ok(c) => c, RwLock::new(Settings::init().expect("Failed to load settings file"));
Err(e) => {
warn!(
"Couldn't load settings file, using default settings.\n{}",
e
);
Settings::default()
}
});
} }
impl Settings { impl Settings {