LibrePages/librepages
4
0
Fork 0
Code Issues 6 Pull requests 10 Projects Releases Packages Wiki Activity

fix: override DATABASE_URL _after_ URL is constructed
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Details

Browse source
This commit is contained in:
Aravinth Manivannan 2022-12-19 12:35:10 +05:30
parent e1c475d05a
commit 631849fceb
Signed by: realaravinth
GPG key ID: AD9F0F08E855ED88
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/settings.rs
View file

@ -136,15 +136,6 @@ impl Settings {
Err(e) => warn!("couldn't interpret PORT: {}", e), Err(e) => warn!("couldn't interpret PORT: {}", e),
} }
if let Ok(val) = env::var("DATABASE_URL") {
let url = Url::parse(&val).expect("couldn't parse Database URL");
s = s.set_override("database.url", url.to_string()).unwrap();
let database_type = DBType::from_url(&url).unwrap();
s = s
.set_override("database.database_type", database_type.to_string())
.unwrap();
}
let intermediate_config = s.build_cloned().unwrap(); let intermediate_config = s.build_cloned().unwrap();
s = s s = s
@ -171,6 +162,15 @@ impl Settings {
) )
.expect("Couldn't set database url"); .expect("Couldn't set database url");
if let Ok(val) = env::var("DATABASE_URL") {
let url = Url::parse(&val).expect("couldn't parse Database URL");
s = s.set_override("database.url", url.to_string()).unwrap();
let database_type = DBType::from_url(&url).unwrap();
s = s
.set_override("database.database_type", database_type.to_string())
.unwrap();
}
let settings = s.build()?.try_deserialize::<Settings>()?; let settings = s.build()?.try_deserialize::<Settings>()?;
settings.check_url(); settings.check_url();