From 14ab5ec766adf7e07a57d5ab63770f6c63df4af2 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 24 Aug 2020 23:07:13 +0200 Subject: Move database config to Rocket.toml. This makes for one place to config everything instead of programatically setting the config. --- src/lib.rs | 14 ++------------ src/main.rs | 5 +---- 2 files changed, 3 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 57d8b7a..330c462 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -26,21 +26,11 @@ pub mod schema; use crate::controllers::{film, room, screening}; use rocket::routes; -use std::collections::HashMap; use std::error::Error; use std::result::Result; -pub fn build_rocket(db_url: &str) -> Result> { - let mut db_config = HashMap::new(); - db_config.insert("url", rocket::config::Value::from(db_url)); - - let mut databases = HashMap::new(); - databases.insert("main", rocket::config::Value::from(db_config)); - - let mut config = rocket::Config::active()?; - config.extras.insert("databases".into(), rocket::config::Value::from(databases)); - - Ok(rocket::custom(config) +pub fn build_rocket() -> Result> { + Ok(rocket::ignite() .attach(db::Connection::fairing()) .attach(rocket_contrib::templates::Template::fairing()) .mount("/", rocket_contrib::serve::StaticFiles::from("./public")) diff --git a/src/main.rs b/src/main.rs index 773fc66..fdc8ff3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,9 +21,6 @@ use std::error::Error; use std::result::Result; fn main() -> Result<(), Box> { - let db_url = dotenv::var("DATABASE_URL") - .map_err(|_| "No database! Set DATABASE_URL env var and try again.")?; - - ramaskrik::build_rocket(&db_url)?.launch(); + ramaskrik::build_rocket()?.launch(); Ok(()) } -- cgit v1.2.3