Better debug messages and logging handling

This commit is contained in:
Lucien Cartier-Tilet 2020-07-11 17:51:38 +02:00
parent 78541f10ba
commit 9cc1a52e5a
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
2 changed files with 45 additions and 22 deletions

View File

@ -40,13 +40,14 @@ pub mod utils;
/// lang_evolve_core::init(); /// lang_evolve_core::init();
/// ``` /// ```
pub fn init() -> std::result::Result<(), log::SetLoggerError> { pub fn init() -> std::result::Result<(), log::SetLoggerError> {
match CombinedLogger::init(vec![ // #[cfg(debug_assertions)]
TermLogger::new( match CombinedLogger::init(if cfg!(debug_assertions) {
vec![
WriteLogger::new(
LevelFilter::Warn, LevelFilter::Warn,
Config::default(), Config::default(),
TerminalMode::Mixed, File::create("core.log").unwrap(),
) ),
.unwrap(),
WriteLogger::new( WriteLogger::new(
LevelFilter::Debug, LevelFilter::Debug,
Config::default(), Config::default(),
@ -57,7 +58,21 @@ pub fn init() -> std::result::Result<(), log::SetLoggerError> {
Config::default(), Config::default(),
File::create("core.log").unwrap(), File::create("core.log").unwrap(),
), ),
]) { ]
} else {
vec![
WriteLogger::new(
LevelFilter::Warn,
Config::default(),
File::create("core.log").unwrap(),
),
WriteLogger::new(
LevelFilter::Info,
Config::default(),
File::create("core.log").unwrap(),
),
]
}) {
Err(why) => { Err(why) => {
warn!("Could not initialize logger: {}", why.to_string()); warn!("Could not initialize logger: {}", why.to_string());
Err(why) Err(why)

View File

@ -347,16 +347,24 @@ impl Settings {
debug!("==============================================="); debug!("===============================================");
for rule in rules { for rule in rules {
debug!( debug!(
"from: {}\tto: {}", "from: \"{}\"\tto: \"{}\"",
rule.get_from().to_string(), rule.get_from().to_string(),
rule.get_to() rule.get_to()
); );
debug!("old: {}", s); let old = s.clone();
s = rule let new = rule
.get_from() .get_from()
.replace_all(&s, rule.get_to().as_str()) .replace_all(&s, rule.get_to().as_str())
.to_string(); .to_string();
debug!("new: {}", s); if cfg!(debug_assertions) {
let diffs = diff_words(&old, &new);
if diffs.diff().len() > 1 {
debug!("diff:\n{}", diff_words(&old, &new));
} else {
debug!("diff: No changes");
}
}
s = new;
} }
Ok(s) Ok(s)
} }