diff --git a/server/Cargo.lock b/server/Cargo.lock index e84bcdc..74b0ff2 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -26,6 +26,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" + [[package]] name = "atoi" version = "2.0.0" @@ -1295,6 +1301,7 @@ dependencies = [ name = "server" version = "0.1.0" dependencies = [ + "anyhow", "axum", "chrono", "dotenv", diff --git a/server/Cargo.toml b/server/Cargo.toml index 1c48f5b..eb623fd 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] +anyhow = "1.0.104" axum = { version = "0.8.9", features = ["macros"] } chrono = { version = "0.4.45", features = ["serde"] } dotenv = "0.15.0" diff --git a/server/src/main.rs b/server/src/main.rs index cc3121d..76b17ca 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -1,5 +1,6 @@ use std::env; +use anyhow::Context; use sqlx::postgres::PgPoolOptions; use tokio::net::TcpListener; @@ -9,34 +10,36 @@ mod routes; #[tokio::main] #[tracing::instrument] -async fn main() { +async fn main() -> anyhow::Result<()> { dotenv::dotenv().ok(); tracing_subscriber::fmt() .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) .init(); - let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set"); + let database_url = env::var("DATABASE_URL").context("DATABASE_URL must be set")?; let pool = PgPoolOptions::new() .max_connections(5) .connect(&database_url) .await - .expect("Failed to connect to database"); + .context("Failed to connect to database")?; sqlx::migrate!() .run(&pool) .await - .expect("Failed to run database migrations"); + .context("Failed to run database migrations")?; - let host = env::var("HOST").expect("HOST must be set"); - let port = env::var("PORT").expect("PORT must be set"); + let host = env::var("HOST").context("HOST must be set")?; + let port = env::var("PORT").context("PORT must be set")?; let addr = format!("{}:{}", host, port); let listener = TcpListener::bind(&addr) .await - .expect(&format!("Failed to bind to address: {}", addr)); + .context(format!("Failed to bind to address: {}", addr))?; - tracing::info!("Starting server at {}:{}", host, port); + tracing::info!(%addr, "Starting server"); axum::serve(listener, routes::create_router(pool).into_make_service()) .await - .expect("Failed to start server"); + .context("Server stopped unexpectedly")?; + + Ok(()) }