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

VELOREN_SAVES_DIR envar now overrides the server persistence db path

Browse Source
This commit is contained in:
Mckol 2020-05-14 20:47:16 +02:00
parent 48c5d37a5d
commit fe859fc2e1
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/persistence/mod.rs
View File

@ -9,7 +9,7 @@ extern crate diesel;
use diesel::prelude::*;
use diesel_migrations::embed_migrations;
use std::fs;
use std::{env, fs, path::PathBuf};
// See: https://docs.rs/diesel_migrations/1.4.0/diesel_migrations/macro.embed_migrations.html
// This macro is called at build-time, and produces the necessary migration info
@ -17,12 +17,29 @@ use std::fs;
embed_migrations!();
pub fn run_migrations(db_dir: &str) -> Result<(), diesel_migrations::RunMigrationsError> {
let db_dir = &apply_saves_dir_override(db_dir);
let _ = fs::create_dir(format!("{}/", db_dir));
embedded_migrations::run_with_output(&establish_connection(db_dir), &mut std::io::stdout())
}
fn establish_connection(db_dir: &str) -> SqliteConnection {
let db_dir = &apply_saves_dir_override(db_dir);
let database_url = format!("{}/db.sqlite", db_dir);
SqliteConnection::establish(&database_url)
.unwrap_or_else(|_| panic!("Error connecting to {}", database_url))
}
fn apply_saves_dir_override(db_dir: &str) -> String {
if let Some(val) = env::var_os("VELOREN_SAVES_DIR") {
let path = PathBuf::from(val);
if path.exists() || path.parent().map(|x| x.exists()).unwrap_or(false) {
// Only allow paths with valid unicode characters
match path.to_str() {
Some(path) => return path.to_owned(),
None => {},
}
}
log::warn!("VELOREN_SAVES_DIR points to an invalid path.");
}
db_dir.to_string()
}