emgauwa/common
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove the _local directory again

Browse source
This commit is contained in:
Tobias Reisinger 2024-03-04 16:09:03 +01:00
parent 3d66ca2472
commit 79327d2efa
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
10 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
emgauwa-lib/build.rs
View file

@ -1,4 +1,4 @@
fn main() {
println!("cargo:rerun-if-changed=migrations");
println!("cargo:rustc-env=DATABASE_URL=sqlite://_local/emgauwa-dev.sqlite");
println!("cargo:rustc-env=DATABASE_URL=sqlite://emgauwa-dev.sqlite");
}

4
emgauwa-lib/src/settings.rs
View file

@ -58,13 +58,9 @@ pub fn load<T>(config_name: &str, env_prefix: &str) -> Result<T, EmgauwaError>
where
for<'de> T: serde::Deserialize<'de>,
{
// TODO: Add switch to only include local config if in development mode
let dev_file =
config::File::with_name(&format!("./_local/emgauwa-{}", config_name)).required(false);
let local_file = config::File::with_name(&format!("./emgauwa-{}", config_name)).required(false);
config::Config::builder()
.add_source(dev_file)
.add_source(local_file)
.add_source(
config::Environment::with_prefix(&format!("EMGAUWA_{}", env_prefix))