diff options
author | Harald Eilertsen <haraldei@anduin.net> | 2019-03-04 16:53:51 +0100 |
---|---|---|
committer | Harald Eilertsen <haraldei@anduin.net> | 2019-03-04 16:58:08 +0100 |
commit | 1f89095fc559c0686aa7e79340c29c7f5a04658b (patch) | |
tree | 02eecc6481fd03965ec0bd628a704246c7c8e7b4 /src/main.rs | |
parent | e0b02ee68d2b66a9c2fbb58173c74d97fa455b46 (diff) | |
download | ramaskrik-social-1f89095fc559c0686aa7e79340c29c7f5a04658b.tar.gz ramaskrik-social-1f89095fc559c0686aa7e79340c29c7f5a04658b.tar.bz2 ramaskrik-social-1f89095fc559c0686aa7e79340c29c7f5a04658b.zip |
Begin implement /rooms endpoint.
Refactors the code by moving the implementation to a library, to make
it testable. A dummy /rooms endpoint returning an empty list was
added as well.
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/main.rs b/src/main.rs index e031e73..fdc8ff3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,36 +15,12 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#![feature(proc_macro_hygiene, decl_macro)] -use rocket_contrib::{ - database, - databases::diesel, -}; -use std::collections::HashMap; +use ramaskrik; use std::error::Error; use std::result::Result; -#[database("main")] -struct DbConn(diesel::PgConnection); - fn main() -> Result<(), Box<dyn Error>> { - let db_url = dotenv::var("DATABASE_URL") - .map_err(|_| "No database! Set DATABASE_URL env var and try again.")?; - - 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)); - - rocket::custom(config) - .attach(DbConn::fairing()) - .mount("/", rocket_contrib::serve::StaticFiles::from("./public")) - .launch(); - + ramaskrik::build_rocket()?.launch(); Ok(()) } |