From 72c3ae5dbef960808a9820906af7f5852537427e Mon Sep 17 00:00:00 2001 From: Camerin Figueroa Date: Fri, 3 May 2024 00:41:26 +0000 Subject: [PATCH] Modified request-mirror to accept environment variables from docker which would override the .env vars --- src/lib.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index ad04a98..c4ffa3a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,9 +23,17 @@ use schema::{ /// ``` pub fn establish_connection() -> PgConnection { - dotenv().ok(); + let key: &str = "DATABASE_URL"; + let database_url: String; + match env::var(key) { + Ok(val) => database_url = val, + Err(e) => { + dotenv().ok(); - let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set"); + database_url = env::var(key).expect("DATABASE_URL must be set"); + } + } + PgConnection::establish(&database_url) .unwrap_or_else(|_| panic!("Error connecting to {}", database_url)) }