Skip to content

Commit

Permalink
fix: treat missing env vars error + rename connection uri variable
Browse files Browse the repository at this point in the history
  • Loading branch information
PJColombo committed Mar 19, 2023
1 parent 509c7f9 commit fca6b62
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CONNECTION_URI=
DB_CONNECTION_URI=
DB_NAME=

# Optional variables
Expand Down
2 changes: 1 addition & 1 deletion log4rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ root:
- stdout

loggers:
indexer:
default:
level: info
appenders:
- indexer_ap
15 changes: 10 additions & 5 deletions src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
})
Expand Down

0 comments on commit fca6b62

Please sign in to comment.