From: Grégory Burri <gregory.burri@matisa.ch>
Date: Thu, 29 Aug 2019 12:04:51 +0000 (+0200)
Subject: Merge
X-Git-Url: http://git.euphorik.ch/?p=recipes.git;a=commitdiff_plain;h=212222751363c15b2155555ac700ff50b69ac578;hp=-c

Merge
---

212222751363c15b2155555ac700ff50b69ac578
diff --combined backend/src/main.rs
index fcb8e12,0536428..3063c63
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@@ -1,21 -1,18 +1,19 @@@
- extern crate actix_web;
- extern crate listenfd;
- extern crate askama;
+ use std::io::prelude::*;
+ use std::{fs::File, env::args};
  
- use listenfd::ListenFd;
  use actix_files as fs;
- use actix_web::{web, middleware, App, HttpServer, HttpResponse, Result, web::Query};
- use askama::Template;
+ use actix_web::{web, middleware, App, HttpServer, HttpResponse, Result, web::Query, middleware::Logger};
  
- use std::io::prelude::*;
+ use askama::Template;
+ use listenfd::ListenFd;
  use ron::de::from_reader;
  use serde::Deserialize;
- use std::{fs::File, env::args};
+ use env_logger;
  
  use itertools::Itertools;
  
  mod consts;
 +mod db;
  
  #[derive(Template)]
  #[template(path = "main.html")]
@@@ -62,15 -59,17 +60,19 @@@ fn main() -> std::io::Result<()> 
  
      println!("Configuration: {:?}", config);
  
 +    let database_connection = db::create_or_update();
 +
+     std::env::set_var("RUST_LOG", "actix_web=info");
+     env_logger::init();
+ 
      let mut listenfd = ListenFd::from_env();
      let mut server =
          HttpServer::new(
              || {
                  App::new()
                      .wrap(middleware::Compress::default())
-                     .wrap(middleware::Logger::default())
+                     .wrap(Logger::default())
+                     .wrap(Logger::new("%a %{User-Agent}i"))
                      .service(web::resource("/").to(main_page))
                      .service(fs::Files::new("/static", "static").show_files_listing())
              }
@@@ -89,7 -88,7 +91,7 @@@
  fn process_args() -> bool {
      fn print_usage() {
          println!("Usage:");
 -        println!(" {} [--help]", get_exe_name());
 +        println!(" {} [--help] [--test]", get_exe_name());
      }
  
      let args: Vec<String> = args().collect();
@@@ -97,9 -96,6 +99,9 @@@
      if args.iter().any(|arg| arg == "--help") {
          print_usage();
          return true
 +    } else if args.iter().any(|arg| arg == "--test") {
 +        let database_connection = db::create_or_update();
 +        return true
      }
  
      false