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

Remove saves dir env var and setting from server settings and just always use saves as the dir name

Browse Source
This commit is contained in:
Imbris 2020-10-10 02:15:54 -04:00
parent 71251ca6a6
commit 39f78e9116
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/lib.rs
View File

@ -120,8 +120,9 @@ impl Server {
info!("Authentication is disabled"); info!("Authentication is disabled");
} }
// persistence_db_dir is relative to data_dir // Relative to data_dir
let persistence_db_dir = data_dir.join(&settings.persistence_db_dir); const PERSISTENCE_DB_DIR: &str = "saves";
let persistence_db_dir = data_dir.join(PERSISTENCE_DB_DIR);
// Run pending DB migrations (if any) // Run pending DB migrations (if any)
debug!("Running DB migrations..."); debug!("Running DB migrations...");

16
server/src/settings.rs
View File

@ -38,8 +38,6 @@ pub struct Settings {
/// When set to None, loads the default map file (if available); otherwise, /// When set to None, loads the default map file (if available); otherwise,
/// uses the value of the file options to decide how to proceed. /// uses the value of the file options to decide how to proceed.
pub map_file: Option<FileOpts>, pub map_file: Option<FileOpts>,
/// Relative paths are relative to the server data dir
pub persistence_db_dir: PathBuf,
pub max_view_distance: Option<u32>, pub max_view_distance: Option<u32>,
pub banned_words_files: Vec<PathBuf>, pub banned_words_files: Vec<PathBuf>,
pub max_player_group_size: u32, pub max_player_group_size: u32,
@ -57,7 +55,6 @@ impl Default for Settings {
max_players: 100, max_players: 100,
start_time: 9.0 * 3600.0, start_time: 9.0 * 3600.0,
map_file: None, map_file: None,
persistence_db_dir: "saves".into(),
max_view_distance: Some(30), max_view_distance: Some(30),
banned_words_files: Vec::new(), banned_words_files: Vec::new(),
max_player_group_size: 6, max_player_group_size: 6,
@ -96,7 +93,6 @@ impl Settings {
} }
default_settings default_settings
} }
.apply_saves_dir_override()
} }
fn save_to_file(&self, path: &Path) -> std::io::Result<()> { fn save_to_file(&self, path: &Path) -> std::io::Result<()> {
@ -147,18 +143,6 @@ impl Settings {
path.push(SETTINGS_FILENAME); path.push(SETTINGS_FILENAME);
path path
} }
fn apply_saves_dir_override(mut self) -> Self {
if let Some(saves_dir) = std::env::var_os("VELOREN_SAVES_DIR") {
let path = PathBuf::from(&saves_dir);
if path.exists() || path.parent().map(|x| x.exists()).unwrap_or(false) {
self.persistence_db_dir = path;
} else {
warn!(?saves_dir, "VELOREN_SAVES_DIR points to an invalid path.");
}
}
self
}
} }
fn with_config_dir(path: &Path) -> PathBuf { fn with_config_dir(path: &Path) -> PathBuf {