From 0adf5a093494bdb7f5d5c0f12913133e333ddfad Mon Sep 17 00:00:00 2001 From: Joris Date: Fri, 31 Jan 2025 22:28:53 +0100 Subject: Migrate to tokio_rusqlite --- src/main.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 5fe8a94..0786f46 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,8 @@ use hyper::server::conn::http1; use hyper::service::service_fn; use hyper_util::rt::TokioIo; -use sqlx::sqlite::SqlitePool; use tokio::net::TcpListener; +use tokio_rusqlite::Connection; mod assets; mod controller; @@ -27,22 +27,28 @@ async fn main() -> Result<(), Box> { let config = config::from_env() .unwrap_or_else(|err| panic!("Error reading config: {err}")); - let pool = SqlitePool::connect(&format!("sqlite:{}", config.db_path)) + let db_conn = Connection::open(config.db_path.clone()) .await - .unwrap(); + .unwrap_or_else(|_| { + panic!("Error while openning DB: {}", config.db_path) + }); let assets = assets::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?; 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?; @@ -56,7 +62,7 @@ async fn main() -> Result<(), Box> { service_fn(move |req| { routes::routes( config.clone(), - pool.clone(), + db_conn.clone(), assets.clone(), templates.clone(), req, -- cgit v1.2.3