robin/logsmash
1
0
Fork 0
mirror of https://codeberg.org/icewind/logsmash.git synced 2026-06-03 18:14:11 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity Actions

store index in log_match

Browse source
This commit is contained in:
Robin Appelman 2024-07-28 15:19:56 +02:00
commit 2bb7f2b47f
1 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/matcher.rs
View file

@ -12,10 +12,11 @@ pub struct LogMatch {
exception: Option<&'static str>, exception: Option<&'static str>,
path: &'static str, path: &'static str,
line: usize, line: usize,
index: usize,
} }
impl LogMatch { impl LogMatch {
pub fn new(statement: &LoggingStatement) -> LogMatch { pub fn new(index: usize, statement: &LoggingStatement) -> LogMatch {
LogMatch { LogMatch {
level: statement.level, level: statement.level,
pattern: Regex::new(statement.regex).unwrap(), pattern: Regex::new(statement.regex).unwrap(),
@ -26,6 +27,7 @@ impl LogMatch {
exception: statement.exception, exception: statement.exception,
path: statement.path, path: statement.path,
line: statement.line, line: statement.line,
index,
} }
} }
} }
@ -36,9 +38,13 @@ pub struct Matcher {
impl Matcher { impl Matcher {
pub fn new(statements: &StatementList) -> Matcher { pub fn new(statements: &StatementList) -> Matcher {
Matcher { let mut matches: Vec<_> = statements
matches: statements.iter().map(LogMatch::new).collect(), .iter()
} .enumerate()
.map(|(index, statement)| LogMatch::new(index, statement))
.collect();
Matcher { matches }
} }
pub fn match_log(&self, log: &LogLine) -> Option<MatchResult> { pub fn match_log(&self, log: &LogLine) -> Option<MatchResult> {
@ -46,17 +52,17 @@ impl Matcher {
let mut best_length = 0; let mut best_length = 0;
if let Some(exception) = &log.exception { if let Some(exception) = &log.exception {
for (i, log_match) in self.matches.iter().enumerate() { for log_match in self.matches.iter() {
if log_match.line == exception.line if log_match.line == exception.line
&& log_match.exception == Some(exception.exception.as_str()) && log_match.exception == Some(exception.exception.as_str())
&& exception.file.ends_with(log_match.path) && exception.file.ends_with(log_match.path)
{ {
return Some(MatchResult::Single(i)); return Some(MatchResult::Single(log_match.index));
} }
} }
} }
for (i, log_match) in self.matches.iter().enumerate() { for log_match in self.matches.iter() {
if log_match.has_meaningful_message if log_match.has_meaningful_message
&& log.level.matches(log_match.level) && log.level.matches(log_match.level)
&& log_match.pattern.is_match(log.message.as_str()) && log_match.pattern.is_match(log.message.as_str())
@ -67,12 +73,12 @@ impl Matcher {
best_length = log_match.pattern_length; best_length = log_match.pattern_length;
} }
best_match = Some(match best_match { best_match = Some(match best_match {
Some(MatchResult::Single(res)) => MatchResult::List(vec![res, i]), Some(MatchResult::Single(res)) => MatchResult::List(vec![res, log_match.index]),
Some(MatchResult::List(mut list)) => { Some(MatchResult::List(mut list)) => {
list.push(i); list.push(log_match.index);
MatchResult::List(list) MatchResult::List(list)
} }
None => MatchResult::Single(i), None => MatchResult::Single(log_match.index),
}); });
} }
} }