From fca6b62ebb3446acfe59b65f5108905d10f7deaf Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Sun, 19 Mar 2023 18:40:08 +0100
Subject: [PATCH] fix: treat missing env vars error + rename connection uri
 variable

---
 .env.example   |  2 +-
 log4rs.yml     |  2 +-
 src/context.rs | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.env.example b/.env.example
index 102e293..c20e83f 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,4 @@
-CONNECTION_URI=
+DB_CONNECTION_URI=
 DB_NAME=
 
 # Optional variables
diff --git a/log4rs.yml b/log4rs.yml
index 75c5ee1..abd7601 100644
--- a/log4rs.yml
+++ b/log4rs.yml
@@ -25,7 +25,7 @@ root:
     - stdout
 
 loggers:
-  indexer:
+  default:
     level: info
     appenders:
       - indexer_ap
diff --git a/src/context.rs b/src/context.rs
index b04f4e3..d746c0f 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -16,12 +16,12 @@ fn default_beacon_node_rpc() -> String {
 }
 
 fn default_logger() -> String {
-    "indexer".to_string()
+    "default".to_string()
 }
 
 #[derive(Deserialize, Debug)]
 struct Environment {
-    connection_uri: String,
+    db_connection_uri: String,
     db_name: String,
     #[serde(default = "default_execution_node_rpc")]
     execution_node_rpc: String,
@@ -41,15 +41,20 @@ pub struct Context {
 pub async fn create_context() -> Result<Context, Box<dyn error::Error>> {
     let Environment {
         beacon_node_rpc,
-        connection_uri,
+        db_connection_uri,
         db_name,
         execution_node_rpc,
         logger,
-    } = envy::from_env::<Environment>()?;
+    } = match envy::from_env::<Environment>() {
+        Ok(env) => env,
+        Err(e) => {
+            return Err(format!("Couldn't read environment variables: {}", e).into());
+        }
+    };
 
     Ok(Context {
         beacon_api: BeaconChainAPI::new(beacon_node_rpc),
-        db_manager: MongoDBManager::new(&connection_uri, &db_name).await?,
+        db_manager: MongoDBManager::new(&db_connection_uri, &db_name).await?,
         provider: Provider::<Http>::try_from(execution_node_rpc)?,
         logger,
     })