From 9234050ad4c510acdd780100a8df80b2557cb3e1 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Sat, 21 Sep 2019 04:01:54 +0200
Subject: Remove explicit clap dependency in favor of structopt's re-exported
 version

---
 src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index dc98df0..a1217d0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,7 @@
 
 use actix_web::http::{Method, StatusCode};
 use actix_web::{fs, middleware, server, App, HttpRequest, HttpResponse};
-use clap::crate_version;
+use structopt::clap::crate_version;
 use simplelog::{Config, LevelFilter, TermLogger, TerminalMode};
 use std::io::{self, Write};
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-- 
cgit v1.2.3


From 5d5b9422eef4d912e9b273a6d7f87df5889425bb Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Fri, 27 Sep 2019 20:59:22 +0200
Subject: Improve logging behavior

It will now fall back to basic logging if no proper terminal is attached as opposed to just failing silently.
---
 src/main.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index a1217d0..65634f3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,6 @@
 use actix_web::http::{Method, StatusCode};
 use actix_web::{fs, middleware, server, App, HttpRequest, HttpResponse};
 use structopt::clap::crate_version;
-use simplelog::{Config, LevelFilter, TermLogger, TerminalMode};
 use std::io::{self, Write};
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::thread;
@@ -74,12 +73,21 @@ fn run() -> Result<(), ContextualError> {
     let sys = actix::System::new("miniserve");
     let miniserve_config = args::parse_args();
 
-    let _ = if miniserve_config.verbose {
-        TermLogger::init(LevelFilter::Info, Config::default(), TerminalMode::default())
+    let log_level = if miniserve_config.verbose {
+        simplelog::LevelFilter::Info
     } else {
-        TermLogger::init(LevelFilter::Error, Config::default(), TerminalMode::default())
+        simplelog::LevelFilter::Error
     };
 
+    if let Err(_) = simplelog::TermLogger::init(
+        log_level,
+        simplelog::Config::default(),
+        simplelog::TerminalMode::Mixed,
+    ) {
+        simplelog::SimpleLogger::init(log_level, simplelog::Config::default())
+            .expect("Couldn't initialize logger")
+    }
+
     if miniserve_config.no_symlinks {
         let is_symlink = miniserve_config
             .path
-- 
cgit v1.2.3


From cec38e951cb127895ff340ebb6b3fa152b80f8b6 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Mon, 30 Sep 2019 04:24:31 +0200
Subject: Make clippy happy

---
 src/main.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 65634f3..eb90eaf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,11 +2,11 @@
 
 use actix_web::http::{Method, StatusCode};
 use actix_web::{fs, middleware, server, App, HttpRequest, HttpResponse};
-use structopt::clap::crate_version;
 use std::io::{self, Write};
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::thread;
 use std::time::Duration;
+use structopt::clap::crate_version;
 use yansi::{Color, Paint};
 
 mod archive;
@@ -79,11 +79,13 @@ fn run() -> Result<(), ContextualError> {
         simplelog::LevelFilter::Error
     };
 
-    if let Err(_) = simplelog::TermLogger::init(
+    if simplelog::TermLogger::init(
         log_level,
         simplelog::Config::default(),
         simplelog::TerminalMode::Mixed,
-    ) {
+    )
+    .is_err()
+    {
         simplelog::SimpleLogger::init(log_level, simplelog::Config::default())
             .expect("Couldn't initialize logger")
     }
-- 
cgit v1.2.3