From 19b9965eb9c6b404c46a45040eb0bf4cb6dacabc Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quentingliech@gmail.com>
Date: Tue, 14 Dec 2021 11:52:00 +0100
Subject: [PATCH] Better error context on startup

---
 crates/cli/src/main.rs   | 9 ++++++---
 crates/cli/src/server.rs | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 93e3ef5a5..be3bde276 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -108,12 +108,15 @@ async fn try_main() -> anyhow::Result<()> {
     let dotenv_path: Option<PathBuf> = dotenv::dotenv()
         .map(Some)
         // Display the error if it is something other than the .env file not existing
-        .or_else(|e| if e.not_found() { Ok(None) } else { Err(e) })?;
+        .or_else(|e| if e.not_found() { Ok(None) } else { Err(e) })
+        .context("failed to load .env file")?;
 
     // Setup logging
     // This writes logs to stderr
     let fmt_layer = tracing_subscriber::fmt::layer().with_writer(std::io::stderr);
-    let filter_layer = EnvFilter::try_from_default_env().or_else(|_| EnvFilter::try_new("info"))?;
+    let filter_layer = EnvFilter::try_from_default_env()
+        .or_else(|_| EnvFilter::try_new("info"))
+        .context("could not setup logging filter")?;
 
     // Don't fill the telemetry layer for now, we want to configure it based on the
     // app config, so we need to delay that a bit
@@ -144,7 +147,7 @@ async fn try_main() -> anyhow::Result<()> {
     let telemetry_config: TelemetryConfig = opts.load_config().unwrap_or_default();
 
     // Setup OpenTelemtry tracing and metrics
-    let tracer = telemetry::setup(&telemetry_config)?;
+    let tracer = telemetry::setup(&telemetry_config).context("failed to setup opentelemetry")?;
     if let Some(tracer) = tracer {
         // Now we can swap out the actual opentelemetry tracing layer
         handle.reload(
diff --git a/crates/cli/src/server.rs b/crates/cli/src/server.rs
index 4a7cb1f95..79774ad82 100644
--- a/crates/cli/src/server.rs
+++ b/crates/cli/src/server.rs
@@ -215,8 +215,12 @@ impl ServerCommand {
     pub async fn run(&self, root: &RootCommand) -> anyhow::Result<()> {
         let config: RootConfig = root.load_config()?;
 
-        let addr: SocketAddr = config.http.address.parse()?;
-        let listener = TcpListener::bind(addr)?;
+        let addr: SocketAddr = config
+            .http
+            .address
+            .parse()
+            .context("could not parse listener address")?;
+        let listener = TcpListener::bind(addr).context("could not bind address")?;
 
         // Connect to the database
         let pool = config.database.connect().await?;