diff options
| author | Kevin J Hoerr <kjhoerr@protonmail.com> | 2019-10-20 13:43:27 -0400 |
|---|---|---|
| committer | Kevin J Hoerr <kjhoerr@protonmail.com> | 2019-10-20 13:43:27 -0400 |
| commit | e2945a9f9eb6a4a21cdfca770edc2fb2662f05b4 (patch) | |
| tree | 4082126fcb85cbd8d9eee22240a2353ee926d1ab /src | |
| parent | 87a703ae2295e418a7c853c8be6a576f2594241a (diff) | |
| download | august-offensive-e2945a9f9eb6a4a21cdfca770edc2fb2662f05b4.tar.gz august-offensive-e2945a9f9eb6a4a21cdfca770edc2fb2662f05b4.tar.bz2 august-offensive-e2945a9f9eb6a4a21cdfca770edc2fb2662f05b4.zip | |
Intermediate package updates
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main.rs b/src/main.rs index 36f07bb..c0fbf13 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,17 +13,16 @@ extern crate serde_derive; pub mod routes; pub mod schema; -use actix_web::{middleware, web, App, HttpServer}; +use actix_web::{middleware, web::route, web::scope, App, HttpServer}; use diesel::pg::PgConnection; use diesel::prelude::*; use dotenv::dotenv; use routes::*; -use std::env; -use std::io::Error; +use std::{env, io::Error}; fn main() { if let Err(ref e) = run() { - println!("error: {}", e); + error!("error: {}", e); ::std::process::exit(1); } @@ -41,9 +40,9 @@ fn run() -> Result<(), Error> { HttpServer::new(|| { App::new().wrap(middleware::Logger::default()).service( - web::scope("/api") - .service(web::scope("/callback").default_service(web::route().to(callback))) - .default_service(web::route().to(not_understood)), + scope("/api") + .service(scope("/callback").default_service(route().to(callback))) + .default_service(route().to(not_understood)), ) }) .bind(&bind_address)? @@ -51,5 +50,6 @@ fn run() -> Result<(), Error> { info!("Started http server: {}", bind_address); - sys.run() + sys.run()?; + Ok(()) } |
