refactor: improve error handling

meetsmore · Sep 2, 2024 · 84328a0 · 84328a0
1 parent 91818a5
commit 84328a0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/scheduler/Cargo.lock b/scheduler/Cargo.lock
diff --git a/scheduler/Cargo.toml b/scheduler/Cargo.toml
@@ -22,6 +22,8 @@ nettu_scheduler_api = { path = "./crates/api" }
 nettu_scheduler_domain = { path = "./crates/domain" }
 nettu_scheduler_infra = { path = "./crates/infra" }
 
+anyhow = "1.0"
+
 actix-web = "4.8"
 
 tokio = { version = "1", features = ["full"] }

diff --git a/scheduler/crates/api/Cargo.toml b/scheduler/crates/api/Cargo.toml
@@ -22,7 +22,7 @@ async-trait = "0.1.42"
 rrule = "0.12.0"
 chrono = { version = "0.4.19", features = ["serde"] }
 chrono-tz = "0.8.1"
-anyhow = "1.0.0"
+anyhow = "1.0"
 jsonwebtoken = "7"
 thiserror = "1.0"
 tracing = "0.1.25"

diff --git a/scheduler/crates/api/src/lib.rs b/scheduler/crates/api/src/lib.rs
@@ -107,9 +107,9 @@ impl Application {
         Ok((server, port))
     }
 
-    pub async fn start(self) -> Result<(), std::io::Error> {
+    pub async fn start(self) -> anyhow::Result<()> {
         self.init_default_account().await;
-        self.server.await
+        self.server.await.map_err(|e| anyhow::anyhow!(e))
     }
 
     async fn init_default_account(&self) {

diff --git a/scheduler/crates/domain/Cargo.toml b/scheduler/crates/domain/Cargo.toml
@@ -17,7 +17,7 @@ serde = { version = "1.0", features = ["derive"] }
 rrule = "0.12.0"
 chrono = { version = "0.4.19", features = ["serde"] }
 chrono-tz = { version = "0.8.1", features = ["serde"] }
-anyhow = "1.0.0"
+anyhow = "1.0"
 url = "2.2.0"
 uuid = { version = "1.1.2", features = ["serde", "v4"] }
 jsonwebtoken = "7"

diff --git a/scheduler/crates/infra/Cargo.toml b/scheduler/crates/infra/Cargo.toml
@@ -17,7 +17,7 @@ serde_json = "1"
 async-trait = "0.1.42"
 chrono = { version = "0.4.19", features = ["serde"] }
 chrono-tz = { version = "0.8.1", features = ["serde"] }
-anyhow = "1.0.0"
+anyhow = "1.0"
 tokio = { version = "1", features = ["macros"] }
 tracing = "0.1.25"
 reqwest = { version = "0.12", features = ["json"] }

diff --git a/scheduler/debian.Dockerfile b/scheduler/debian.Dockerfile
@@ -25,6 +25,9 @@ RUN --mount=type=bind,source=src,target=/app/${APP_NAME}/src \
 
 FROM debian:stable-slim
 
+# Enable backtraces
+ENV RUST_BACKTRACE=1
+
 RUN apt update \
   && apt install -y openssl ca-certificates \
   && apt clean \

diff --git a/scheduler/src/main.rs b/scheduler/src/main.rs
@@ -5,7 +5,7 @@ use nettu_scheduler_infra::setup_context;
 use telemetry::init_subscriber;
 
 #[tokio::main]
-async fn main() -> std::io::Result<()> {
+async fn main() -> anyhow::Result<()> {
     // Initialize the environment variables for SSL certificates
     openssl_probe::init_ssl_cert_env_vars();