Use file as source of truth

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

src/main.rs

@@ -11,37 +11,34 @@ use axum::serve;
 use clap::Parser;
 use log::info;
 use log4rs::config::Deserializers;
-use std::{error::Error, net::SocketAddr};
+use std::net::SocketAddr;
 use tokio::net::TcpListener;
+use utils::shutdown_signal;
 
-use config::{Args, Config};
+use config::Args;
 use state::State;
 
 #[tokio::main]
 async fn main() {
     let args = Args::parse();
-    log4rs::init_file(args.log_config, Deserializers::default()).unwrap();
+    log4rs::init_file(&args.log_config, Deserializers::default()).unwrap();
 
-    let config = Config::try_from(&args.config).unwrap();
-    let state = State::from_config(config.clone()).await;
+    let state = State::from_args(args).await.unwrap();
 
-    init(&state).await.unwrap();
-
-    let routes = routes::routes(state);
-    let app = axum::Router::new().nest(&format!("{}/api", config.server.subpath), routes);
-
-    let addr = SocketAddr::from((config.server.address, config.server.port));
-    let listener = TcpListener::bind(addr).await.unwrap();
-
-    info!("Listening on {}", listener.local_addr().unwrap());
-    serve(listener, app).await.unwrap();
-}
-
-async fn init(state: &State) -> Result<(), Box<dyn Error + Send + Sync>> {
     sqlx::migrate!("./migrations")
         .run(&state.pg_pool)
         .await
         .expect("Failed to run migrations");
 
-    Ok(())
+    let routes = routes::routes(state.clone());
+    let app = axum::Router::new().nest(&format!("{}/api", state.config.server.subpath), routes);
+
+    let addr = SocketAddr::from((state.config.server.address, state.config.server.port));
+    let listener = TcpListener::bind(addr).await.unwrap();
+
+    info!("Listening on {}", listener.local_addr().unwrap());
+    serve(listener, app)
+        .with_graceful_shutdown(shutdown_signal())
+        .await
+        .unwrap();
 }