X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;ds=sidebyside;f=backend%2Fsrc%2Fmain.rs;h=6d6b09aefb34a91a39de4818f2b24d8bbe68b486;hb=ee48054a52b97e1d8bce3865b74462fd5c8a30d8;hp=fcb8e1284c93395cc9dfb6ab69c733f5c6ec439a;hpb=87bc628b563f61185c4f9ec48627029b17d32bba;p=recipes.git

diff --git a/backend/src/main.rs b/backend/src/main.rs
index fcb8e12..6d6b09a 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -1,16 +1,14 @@
-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;
 
@@ -30,7 +28,7 @@ pub struct Request {
 
 fn main_page(query: Query<Request>) -> Result<HttpResponse> {
 
-    let main_template = MainTemplate { test: &"test" };
+    let main_template = MainTemplate { test: &"*** test ***" };
 
     let s = main_template.render().unwrap();
     Ok(HttpResponse::Ok().content_type("text/html").body(s))
@@ -62,7 +60,10 @@ fn main() -> std::io::Result<()> {
 
     println!("Configuration: {:?}", config);
 
-    let database_connection = db::create_or_update();
+    // 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 =
@@ -70,7 +71,8 @@ fn main() -> std::io::Result<()> {
             || {
                 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())
             }