From 85d469196ff17a3aee7a950ae57d4797938e8f42 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 15 May 2018 11:35:19 -0700 Subject: fix build (non-functional though) --- rust/src/bin/fatcat-iron.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'rust/src/bin/fatcat-iron.rs') diff --git a/rust/src/bin/fatcat-iron.rs b/rust/src/bin/fatcat-iron.rs index 1f443e8e..d89a9c53 100644 --- a/rust/src/bin/fatcat-iron.rs +++ b/rust/src/bin/fatcat-iron.rs @@ -5,6 +5,9 @@ extern crate clap; extern crate fatcat; extern crate fatcat_api; extern crate futures; +extern crate dotenv; +extern crate diesel; +extern crate iron_diesel_middleware; extern crate iron; extern crate iron_slog; extern crate swagger; @@ -18,6 +21,9 @@ use iron_slog::{LoggerMiddleware, DefaultLogFormatter}; use clap::{App, Arg}; use iron::{Chain, Iron}; use swagger::auth::AllowAllMiddleware; +use dotenv::dotenv; +use std::env; +use iron_diesel_middleware::{DieselMiddleware, DieselPooledConnection, DieselReqExt}; /// Create custom server, wire it to the autogenerated router, /// and pass it to the web server. @@ -40,7 +46,7 @@ fn main() { dotenv().ok(); let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set"); - let diesel_middleware: DieselMiddleware = DieselMiddleware::new(database_url).unwrap(); + let diesel_middleware: DieselMiddleware = DieselMiddleware::new(&database_url).unwrap(); let server = fatcat::server().unwrap(); let router = fatcat_api::router(server); @@ -54,7 +60,7 @@ fn main() { chain.link_before(AllowAllMiddleware::new("cosmo")); chain.link_after(fatcat::XClacksOverheadMiddleware); - chain.link_before(diesel_middleware); + //chain.link_before(diesel_middleware); if matches.is_present("https") { unimplemented!() -- cgit v1.2.3