diff --git a/src/main.rs b/src/main.rs index 8a18190..83e44d9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -82,12 +82,11 @@ fn main() { let mut remote_wrkdir: Option = None; let mut protocol: FileTransferProtocol = FileTransferProtocol::Sftp; // Default protocol let mut ticks: Duration = Duration::from_millis(10); - let mut log_level: Option = Some(logging::LevelFilter::Info); + let mut log_enabled: bool = true; //Process options let mut opts = Options::new(); opts.optopt("P", "password", "Provide password from CLI", ""); opts.optopt("T", "ticks", "Set UI ticks; default 10ms", ""); - opts.optflag("D", "debug", "Enable debug log level"); opts.optflag("q", "quiet", "Disable logging"); opts.optflag("v", "version", ""); opts.optflag("h", "help", "Print this menu"); @@ -113,10 +112,7 @@ fn main() { } // Logging if matches.opt_present("q") { - log_level = None; - } - if matches.opt_present("D") { - log_level = Some(logging::LevelFilter::Trace); + log_enabled = false; } // Match password if let Some(passwd) = matches.opt_str("P") { @@ -169,8 +165,8 @@ fn main() { Err(_) => PathBuf::from("/"), }; // Setup logging - if let Some(log_level) = log_level { - if let Err(err) = logging::init(log_level) { + if log_enabled { + if let Err(err) = logging::init() { eprintln!("Failed to initialize logging: {}", err); } } diff --git a/src/system/logging.rs b/src/system/logging.rs index c429749..bea7d7d 100644 --- a/src/system/logging.rs +++ b/src/system/logging.rs @@ -29,15 +29,14 @@ use crate::system::environment::{get_log_paths, init_config_dir}; use crate::utils::file::open_file; // ext -pub use simplelog::LevelFilter; -use simplelog::{ConfigBuilder, WriteLogger}; +use simplelog::{ConfigBuilder, LevelFilter, WriteLogger}; use std::fs::File; use std::path::PathBuf; /// ### init /// /// Initialize logger -pub fn init(log_level: LevelFilter) -> Result<(), String> { +pub fn init() -> Result<(), String> { // Init config dir let config_dir: PathBuf = match init_config_dir() { Ok(Some(p)) => p, @@ -57,7 +56,7 @@ pub fn init(log_level: LevelFilter) -> Result<(), String> { .set_time_format_str("%Y-%m-%dT%H:%M:%S%z") .build(); // Make logger - WriteLogger::init(log_level, config, file) + WriteLogger::init(LevelFilter::Trace, config, file) .map_err(|e| format!("Failed to initialize logger: {}", e)) } @@ -68,6 +67,6 @@ mod test { #[test] fn test_system_logging_setup() { - assert!(init(LevelFilter::Trace).is_ok()); + assert!(init().is_ok()); } }