improving error count analyzer

aquanauts · Aug 3, 2024 · 6cd426f · 6cd426f
1 parent 109528b
commit 6cd426f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/alogamous/__main__.py b/src/alogamous/__main__.py
@@ -39,7 +39,7 @@
     analyzer.analyze_log_stream(
         [
             # echo_analyzer.EchoAnalyzer(),
-            error_counter_analyzer.ErrorCounterAnalyzer(),
+            error_counter_analyzer.ErrorCounterAnalyzer(line_parser),
             flag_duplicate_log_messages.FlagDuplicateLogMessages(),
             line_count_analyzer.LineCountAnalyzer(),
             format_analyzer.FormatAnalyzer(line_parser),

diff --git a/src/alogamous/error_counter_analyzer.py b/src/alogamous/error_counter_analyzer.py
@@ -1,12 +1,14 @@
-from alogamous import analyzer
+from alogamous import analyzer, log_line_parser
 
 
 class ErrorCounterAnalyzer(analyzer.Analyzer):
-    def __init__(self):
+    def __init__(self, line_parser):
+        self.parser = line_parser
         self.error_number = 0
 
     def read_log_line(self, line):
-        if "ERROR" in line:
+        parsed_line = self.parser.parse(line)
+        if parsed_line["type"] == log_line_parser.LineType.LOG_LINE and parsed_line["level"].lower() == "error":
             self.error_number += 1
 
     def report(self, out_stream):

diff --git a/tests/test_error_counter.py b/tests/test_error_counter.py
@@ -1,10 +1,13 @@
 import io
 
-from alogamous import error_counter_analyzer
+from alogamous import error_counter_analyzer, log_line_parser
 
 
 def test_error_counter():
-    counter = error_counter_analyzer.ErrorCounterAnalyzer()
+    parser = log_line_parser.LogLineParser(
+        ["datetime", "source", "level", "message"], " - ", "===================================================="
+    )
+    counter = error_counter_analyzer.ErrorCounterAnalyzer(parser)
     in_stream = io.StringIO(
         """2024-06-20 17:16:03,660 - root - ERROR - Caught exception N/A.
 2024-06-20 17:16:03,660 - root - ERROR - Caught exception N/A. Message: Unclosed connector NoneType: None"""
@@ -17,7 +20,10 @@ def test_error_counter():
 
 
 def test_no_errors():
-    counter = error_counter_analyzer.ErrorCounterAnalyzer()
+    parser = log_line_parser.LogLineParser(
+        ["datetime", "source", "level", "message"], " - ", "===================================================="
+    )
+    counter = error_counter_analyzer.ErrorCounterAnalyzer(parser)
     in_stream = io.StringIO("""2024-06-20 17:17:04,278 - root - INFO - Updating prices
 2024-06-20 17:24:34,091 - root - INFO - Closing client connection.""")
     out_stream = io.StringIO()
@@ -28,7 +34,10 @@ def test_no_errors():
 
 
 def test_no_input_lines():
-    counter = error_counter_analyzer.ErrorCounterAnalyzer()
+    parser = log_line_parser.LogLineParser(
+        ["datetime", "source", "level", "message"], " - ", "===================================================="
+    )
+    counter = error_counter_analyzer.ErrorCounterAnalyzer(parser)
     out_stream = io.StringIO()
     counter.report(out_stream)
     assert out_stream.getvalue().strip() == "Number of error lines: 0"