diff options
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/main.rs b/src/main.rs index 39dd9c0..2482d95 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,12 +2,11 @@ use actix_web::http::{Method, StatusCode}; use actix_web::{fs, middleware, server, App, HttpRequest, HttpResponse}; -use clap::crate_version; -use simplelog::{Config, LevelFilter, TermLogger, TerminalMode}; 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; @@ -74,12 +73,23 @@ 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 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") + } + if miniserve_config.no_symlinks { let is_symlink = miniserve_config .path |