diff --git a/TODO b/TODO index 9b3b9fa..4e068e1 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,5 @@ Test what happens when a Filter's pattern Set changes (I think it's shitty) -move match logging from concepts/filter to daemon/filter - test migration stream: test regex ending with $ test Filter::regex conformity after setup diff --git a/src/concepts/filter.rs b/src/concepts/filter.rs index ba7a205..e8e7a0b 100644 --- a/src/concepts/filter.rs +++ b/src/concepts/filter.rs @@ -9,7 +9,6 @@ use std::{ use chrono::TimeDelta; use regex::Regex; use serde::{Deserialize, Serialize}; -use tracing::info; use super::{parse_duration, PatternType}; use super::{Action, Match, Pattern, Patterns}; @@ -208,12 +207,10 @@ impl Filter { } } if result.len() == self.patterns.len() { - info!("{}: match {:?}", self, result); return Some(result); } } else { - info!("{}: match []", self); - return Some(vec![".".to_string()]); + return Some(vec![]); } } } diff --git a/src/daemon/filter/mod.rs b/src/daemon/filter/mod.rs index 136e1d8..64614a1 100644 --- a/src/daemon/filter/mod.rs +++ b/src/daemon/filter/mod.rs @@ -93,6 +93,8 @@ impl FilterManager { return false; } + info!("{}: match {:?}", self.filter, &m); + let trigger = match self.filter.retry { None => true, Some(retry) => {