1 files changed, 13 insertions, 17 deletions

diff --git a/src/main.rs b/src/main.rs
index 5f3b8c6..30832d3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,12 +1,9 @@
+use anyhow::Result;
 use hyper::server::conn::http1;
 use hyper::service::service_fn;
 use hyper_util::rt::TokioIo;
-use sqlx::sqlite::SqlitePool;
 use tokio::net::TcpListener;
 
-#[macro_use]
-extern crate log;
-
 mod assets;
 mod controller;
 mod crypto;
@@ -24,31 +21,30 @@ mod validation;
 use model::config;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    env_logger::Builder::from_env(
-        env_logger::Env::default().default_filter_or("warn"),
-    )
-    .init();
+async fn main() -> Result<()> {
+    env_logger::init();
 
     let config = config::from_env()
         .unwrap_or_else(|err| panic!("Error reading config: {err}"));
 
-    let pool = SqlitePool::connect(&format!("sqlite:{}", config.db_path))
-        .await
-        .unwrap();
+    let db_conn = db::init(&config.db_path).await?;
 
     let assets = assets::get();
 
-    let templates = templates::get();
+    let templates = templates::get()?;
 
-    tokio::spawn(jobs::start(config.clone(), pool.clone(), templates.clone()));
+    tokio::spawn(jobs::start(
+        config.clone(),
+        db_conn.clone(),
+        templates.clone(),
+    ));
 
     let listener = TcpListener::bind(config.socket_address).await?;
-    info!("Starting server at {}", config.socket_address);
+    log::info!("Starting server at {}", config.socket_address);
 
     loop {
         let config = config.clone();
-        let pool = pool.clone();
+        let db_conn = db_conn.clone();
         let assets = assets.clone();
         let templates = templates.clone();
         let (stream, _) = listener.accept().await?;
@@ -62,7 +58,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
                     service_fn(move |req| {
                         routes::routes(
                             config.clone(),
-                            pool.clone(),
+                            db_conn.clone(),
                             assets.clone(),
                             templates.clone(),
                             req,