From a6a3d707d68da3a6e2870e4ba8bcff40878d4a30 Mon Sep 17 00:00:00 2001
From: Damjan Georgievski <gdamjan@gmail.com>
Date: Sat, 21 Jul 2018 14:58:27 +0200
Subject: [PATCH] implement a default logger

I've snuck some renames of variables too
---
 Cargo.toml  |  1 +
 src/main.rs | 12 ++++++++----
 src/web.rs  |  7 ++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f40525c..78c9155 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,7 @@ readme = "README.md"
 [dependencies]
 actix-web = "0.7"
 bytes = "0.4"
+env_logger = "*"
 futures = "0.1"
 tar = "0.4"
 percent-encoding = "1.0"
diff --git a/src/main.rs b/src/main.rs
index c434c3c..f7f8b34 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,6 @@
 extern crate actix_web;
 extern crate bytes;
+extern crate env_logger;
 extern crate futures;
 extern crate tar;
 extern crate htmlescape;
@@ -16,13 +17,16 @@ use std::io;
 
 // TODO cli args
 fn main() -> Result<(), io::Error> {
+    std::env::set_var("RUST_LOG", "actix_web=info");
+    env_logger::init();
+
     let bind_addr = env::var("HTTP_ADDR").unwrap_or(String::from("0.0.0.0:8000"));
-    let sys = actix::System::new("static_index");
+    let sys = actix::System::new("http_server_rs");
 
     server::new(web::create_app)
-    .bind(&bind_addr)
-    .expect(&format!("Can't listen on {} ", bind_addr))
-    .start();
+        .bind(&bind_addr)
+        .expect(&format!("Can't listen on {} ", bind_addr))
+        .start();
 
     println!("Started http server: {}", bind_addr);
     let _ = sys.run();
diff --git a/src/web.rs b/src/web.rs
index 33261ef..7da303e 100644
--- a/src/web.rs
+++ b/src/web.rs
@@ -1,4 +1,4 @@
-use actix_web::{error, fs, App, HttpRequest, HttpResponse, Responder, http::Method};
+use actix_web::{error, fs, App, HttpRequest, HttpResponse, Responder, http::Method, middleware};
 use futures::Stream;
 use percent_encoding::{utf8_percent_encode, DEFAULT_ENCODE_SET};
 use htmlescape::encode_minimal as escape_html_entity;
@@ -9,10 +9,11 @@ use std::path::PathBuf;
 use std;
 
 pub fn create_app() -> App {
-    let s = fs::StaticFiles::new(".").unwrap().show_files_listing().files_listing_renderer(handle_directory);
+    let static_files = fs::StaticFiles::new(".").unwrap().show_files_listing().files_listing_renderer(handle_directory);
     App::new()
+        .middleware(middleware::Logger::default())
         .resource(r"/{tail:.*}.tar", |r| r.method(Method::GET).f(handle_tar))
-        .handler("/", s)
+        .handler("/", static_files)
 }
 
 fn handle_directory<'a, 'b>(