From e2945a9f9eb6a4a21cdfca770edc2fb2662f05b4 Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <kjhoerr@protonmail.com>
Date: Sun, 20 Oct 2019 13:43:27 -0400
Subject: Intermediate package updates

---
 Cargo.toml  | 14 ++++++++------
 src/main.rs | 16 ++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ac665c3..45c7dce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,13 +12,15 @@ name = "august-offensive"
 path = "src/main.rs"
 
 [dependencies]
-dotenv = "0.10"
-log = "0.4.0"
-env_logger = "0.6.2"
+dotenv = "0.14"
+log = "0.4"
+env_logger = "0.7"
+anyhow = "1.0"
 
-diesel = { version = "1.4.2", features = ["postgres"] }
+diesel = { version = "1.4.3", features = ["postgres"] }
 
-actix-rt = "0.2.4"
-actix-web = "1.0.5"
+actix-rt = "0.2.5"
+actix-web = "1.0.8"
+actix-diesel = "0.3.0"
 serde = "1.0"
 serde_derive = "1.0"
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(())
 }
-- 
cgit