Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle invalid settings gracefully (use default, give warning).

Browse Source
This commit is contained in:
Sophia Waggoner 2023-03-22 11:16:30 -07:00
parent b600f08c09
commit b1943cdb26
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/settings.rs
View File

@ -227,7 +227,7 @@ impl Settings {
pub fn load(path: &Path) -> Self { pub fn load(path: &Path) -> Self {
let path = Self::get_settings_path(path); let path = Self::get_settings_path(path);
let settings = if let Ok(file) = fs::File::open(&path) { let mut settings = if let Ok(file) = fs::File::open(&path) {
match ron::de::from_reader(file) { match ron::de::from_reader(file) {
Ok(x) => x, Ok(x) => x,
Err(e) => { Err(e) => {
@ -255,13 +255,9 @@ impl Settings {
default_settings default_settings
}; };
if let Err(e) = settings.validate() { settings.validate();
// TODO: Handle in a better way (like have load return result)
panic!("{e}");
} else {
settings settings
} }
}
fn save_to_file(&self, path: &Path) -> std::io::Result<()> { fn save_to_file(&self, path: &Path) -> std::io::Result<()> {
// Create dir if it doesn't exist // Create dir if it doesn't exist
@ -314,12 +310,20 @@ impl Settings {
path path
} }
fn validate(&self) -> Result<(), InvalidSettingsError> { fn validate(&mut self) {
if self.day_length <= 0.0 { const INVALID_SETTING_MSG: &str =
return Err(InvalidSettingsError::InvalidDayDuration); "Invalid value for setting in userdata/server/server_config/settings.ron.";
}
Ok(()) let default_values = Settings::default();
if self.day_length <= 0.0 {
warn!(
"{} Setting: day_length, Value: {}. Set day_length to it's default value of {}. \
Help: day_length must be a positive floating point value above 0.",
INVALID_SETTING_MSG, self.day_length, default_values.day_length
);
self.day_length = default_values.day_length;
}
} }
} }