Skip to content

Commit 6d34f38

Browse files
committed
fixup! Add file-based config support.
1 parent 30466d4 commit 6d34f38

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

rust/server/src/util/config.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ pub(crate) struct PostgreSQLConfig {
2323

2424
impl PostgreSQLConfig {
2525
pub(crate) fn to_connection_string(&self) -> String {
26-
let username = std::env::var("VSS_POSTGRESQL_USERNAME")
26+
let username_env = std::env::var("VSS_POSTGRESQL_USERNAME");
27+
let username = username_env.as_ref()
2728
.ok()
28-
.or_else(|| self.username.clone())
29+
.or_else(|| self.username.as_ref())
2930
.expect("PostgreSQL database username must be provided in config or env var VSS_POSTGRESQL_USERNAME must be set.");
30-
let password = std::env::var("VSS_POSTGRESQL_PASSWORD")
31+
let password_env = std::env::var("VSS_POSTGRESQL_PASSWORD");
32+
let password = password_env.as_ref()
3133
.ok()
32-
.or_else(|| self.password.clone())
34+
.or_else(|| self.password.as_ref())
3335
.expect("PostgreSQL database password must be provided in config or env var VSS_POSTGRESQL_PASSWORD must be set.");
3436

3537
format!(

0 commit comments

Comments
 (0)