diff --git a/Cargo.toml b/Cargo.toml index 2e8793c..e750b6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,8 @@ notify-rust = "3.4.2" colored = "1.6.1" percent-encoding = "1.0.1" hyper = "0.12.10" +log = "0.4.6" +beautylog = "0.1.0" [[bin]] name = "mars-server" diff --git a/src/client.rs b/src/client.rs index d054093..1ef9146 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1,13 +1,9 @@ -extern crate colored; -extern crate percent_encoding; -extern crate hyper; -extern crate mars; +#[macro_use] +extern crate log; use std::env; use std::process::exit; -use colored::*; - use percent_encoding::{percent_decode, percent_encode, DEFAULT_ENCODE_SET}; use hyper::Client; @@ -17,9 +13,11 @@ use mars::{GeneralBuilder, builder_arguments_from_string}; fn main() { + beautylog::init(log::LevelFilter::Info).ok(); + let current_dir = match env::current_dir() { Err(e) => { - eprintln!("Couldn't find current directory: {:?}", e); + error!("couldn't find current directory: {}", e); exit(1); }, Ok(path) => { @@ -48,7 +46,7 @@ fn fetch_url(uri: hyper::Uri) -> impl Future { .map(|_| ()) // If there was an error, build in client .map_err(move |_| { - eprintln!("{}", "Server not listening, building in client...".bold().yellow()); + warn!("{}", "server not listening, building in client..."); let builder = GeneralBuilder::new(); let uri = percent_decode(uri.path().as_bytes()).decode_utf8().unwrap(); let (path, args) = builder_arguments_from_string(&*uri); diff --git a/src/server.rs b/src/server.rs index 72270b3..32c7be1 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1,7 +1,5 @@ -extern crate colored; -extern crate percent_encoding; -extern crate hyper; -extern crate mars; +#[macro_use] +extern crate log; use std::thread; use std::sync::{Mutex, Arc, mpsc}; @@ -18,6 +16,8 @@ use mars::{GeneralBuilder, builder_arguments_from_string}; fn main() { + beautylog::init(log::LevelFilter::Info).ok(); + let (tx, rx) = mpsc::channel(); let tasks = Arc::new(Mutex::new(vec![])); @@ -38,9 +38,9 @@ fn main() { }); r }) - .map_err(|e| eprintln!("server error: {}", e)); + .map_err(|e| error!("server error: {}", e)); - println!("{}", format!("Mars server listening on {}...", addr).bold().green()); + info!("mars server listening on {}...", addr); hyper::rt::run(server); });