diff options
author | Harald Eilertsen <haraldei@anduin.net> | 2020-08-24 23:07:13 +0200 |
---|---|---|
committer | Harald Eilertsen <haraldei@anduin.net> | 2020-08-24 23:07:13 +0200 |
commit | 14ab5ec766adf7e07a57d5ab63770f6c63df4af2 (patch) | |
tree | dd2cda70f2475f19b727aebd21010f83b85130d0 /src/lib.rs | |
parent | 87734ea6b0311903d42ed9ae55965bdf4ea13cb4 (diff) | |
download | ramaskrik-social-14ab5ec766adf7e07a57d5ab63770f6c63df4af2.tar.gz ramaskrik-social-14ab5ec766adf7e07a57d5ab63770f6c63df4af2.tar.bz2 ramaskrik-social-14ab5ec766adf7e07a57d5ab63770f6c63df4af2.zip |
Move database config to Rocket.toml.
This makes for one place to config everything instead of programatically
setting the config.
Diffstat (limited to 'src/lib.rs')
-rw-r--r-- | src/lib.rs | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -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<rocket::Rocket, Box<dyn Error>> { - 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<rocket::Rocket, Box<dyn Error>> { + Ok(rocket::ignite() .attach(db::Connection::fairing()) .attach(rocket_contrib::templates::Template::fairing()) .mount("/", rocket_contrib::serve::StaticFiles::from("./public")) |