alamin/websurfx
alamin/websurfx
0
0
Fork 0
mirror of https://github.com/neon-mmd/websurfx.git synced 2024-11-22 14:08:23 -05:00
Code Issues Releases Activity

🔧 chore: improve logging based on levels & config options (#173)

Browse Source
This commit is contained in:
neon_arch 2023-08-03 23:09:08 +03:00
parent e02fafd69c
commit 8b0f2f50f0
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/config/parser.rs
View File

@ -4,7 +4,7 @@
use super::parser_models::Style; use super::parser_models::Style;
use log::LevelFilter; use log::LevelFilter;
use rlua::Lua; use rlua::Lua;
use std::{collections::HashMap, format, fs, io::Write, path::Path, thread::available_parallelism}; use std::{collections::HashMap, format, fs, path::Path, thread::available_parallelism};
// ------- Constants -------- // ------- Constants --------
static COMMON_DIRECTORY_NAME: &str = "websurfx"; static COMMON_DIRECTORY_NAME: &str = "websurfx";
@ -79,26 +79,26 @@ impl Config {
// Check whether logging has not been initialized before. // Check whether logging has not been initialized before.
if logging_initialized { if logging_initialized {
// Initializing logging middleware with level set to default or info. if let Ok(pkg_env_var) = std::env::var("PKG_ENV"){
let mut log_level: LevelFilter = LevelFilter::Off; if pkg_env_var.to_lowercase() == "dev" {
if logging && debug == false { env_logger::Builder::new().filter(None, LevelFilter::Trace).init();
log_level = LevelFilter::Info; }
} else if debug { } else {
log_level = LevelFilter::Trace; // Initializing logging middleware with level set to default or info.
}; let mut log_level: LevelFilter = LevelFilter::Error;
env_logger::Builder::new().filter(None, log_level).init(); if logging && debug == false {
log_level = LevelFilter::Info;
} else if debug {
log_level = LevelFilter::Debug;
};
env_logger::Builder::new().filter(None, log_level).init();
}
} }
let threads: u8 = if parsed_threads == 0 { let threads: u8 = if parsed_threads == 0 {
let total_num_of_threads:usize = available_parallelism()?.get() /2; let total_num_of_threads: usize = available_parallelism()?.get() / 2;
if debug || logging { log::error!("Config Error: The value of `threads` option should be a non zero positive integer");
log::error!("Config Error: The value of `threads` option should be a non zero positive integer"); log::info!("Falling back to using {} threads", total_num_of_threads);
log::info!("Falling back to using {} threads", total_num_of_threads)
} else {
std::io::stdout()
.lock()
.write_all(&format!("Config Error: The value of `threads` option should be a non zero positive integer\nFalling back to using {} threads\n", total_num_of_threads).into_bytes())?;
};
total_num_of_threads as u8 total_num_of_threads as u8
} else { } else {
parsed_threads parsed_threads