From edb288a27157cf85993dad9940f90c053caa3ae1 Mon Sep 17 00:00:00 2001
From: Phillip Tarrant <ptarrant@gmail.com>
Date: Wed, 7 Jan 2026 12:33:43 -0600
Subject: [PATCH] Fixed some print statements to leverage logging, pulled in
 most recent dev edits, added exports to gitignore

---
 .gitignore      |  3 +++
 src/analyzer.py | 18 ++++++++++++------
 src/database.py | 12 ++++++++----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 70b93e4..63ae0e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,6 @@ data/
 # Personal canary tokens or sensitive configs
 *canary*token*.yaml
 personal-values.yaml
+
+#exports dir (keeping .gitkeep so we have the dir)
+/exports/*
\ No newline at end of file
diff --git a/src/analyzer.py b/src/analyzer.py
index a745813..b10e4e7 100644
--- a/src/analyzer.py
+++ b/src/analyzer.py
@@ -8,10 +8,13 @@ from datetime import datetime, timedelta
 import re
 from wordlists import get_wordlists
 from config import get_config
+from logger import get_app_logger
 """
 Functions for user activity analysis
 """
 
+app_logger = get_app_logger()
+
 class Analyzer:
     """
     Analyzes users activity and produces aggregated insights
@@ -56,7 +59,7 @@ class Analyzer:
         attack_urls_threshold = config.attack_urls_threshold
         uneven_request_timing_time_window_seconds = config.uneven_request_timing_time_window_seconds
 
-        print(f"http_risky_methods_threshold: {http_risky_methods_threshold}")
+        app_logger.debug(f"http_risky_methods_threshold: {http_risky_methods_threshold}")
 
         score = {}
         score["attacker"] = {"risky_http_methods": False, "robots_violations": False, "uneven_request_timing": False, "different_user_agents": False, "attack_url": False}
@@ -185,7 +188,7 @@ class Analyzer:
             variance = sum((x - mean) ** 2 for x in time_diffs) / len(time_diffs)
             std = variance ** 0.5
             cv = std/mean
-            print(f"Mean: {mean} - Variance {variance} - Standard Deviation {std} - Coefficient of Variation: {cv}")
+            app_logger.debug(f"Mean: {mean} - Variance {variance} - Standard Deviation {std} - Coefficient of Variation: {cv}")
 
         if cv >= uneven_request_timing_threshold:
             score["attacker"]["uneven_request_timing"] = True
@@ -268,10 +271,13 @@ class Analyzer:
         regular_user_score = regular_user_score + score["regular_user"]["different_user_agents"] * weights["regular_user"]["different_user_agents"]
         regular_user_score = regular_user_score + score["regular_user"]["attack_url"] * weights["regular_user"]["attack_url"]
 
-        print(f"Attacker score: {attacker_score}")
-        print(f"Good Crawler score: {good_crawler_score}")
-        print(f"Bad Crawler score: {bad_crawler_score}")
-        print(f"Regular User score: {regular_user_score}")
+        score_details = f"""
+        Attacker score: {attacker_score}
+        Good Crawler score: {good_crawler_score}
+        Bad Crawler score: {bad_crawler_score}
+        Regular User score: {regular_user_score}
+        """
+        app_logger.debug(score_details)
 
         analyzed_metrics = {"risky_http_methods": http_method_attacker_score, "robots_violations": violated_robots_ratio, "uneven_request_timing": mean, "different_user_agents": user_agents_used, "attack_url": attack_urls_found_list}
         category_scores = {"attacker": attacker_score, "good_crawler": good_crawler_score, "bad_crawler": bad_crawler_score, "regular_user": regular_user_score}
diff --git a/src/database.py b/src/database.py
index 0245105..c184e9e 100644
--- a/src/database.py
+++ b/src/database.py
@@ -22,6 +22,9 @@ from sanitizer import (
     sanitize_attack_pattern,
 )
 
+from logger import get_app_logger
+
+applogger = get_app_logger()
 
 class DatabaseManager:
     """
@@ -154,7 +157,7 @@ class DatabaseManager:
         except Exception as e:
             session.rollback()
             # Log error but don't crash - database persistence is secondary to honeypot function
-            print(f"Database error persisting access: {e}")
+            applogger.critical(f"Database error persisting access: {e}")
             return None
         finally:
             self.close_session()
@@ -193,7 +196,7 @@ class DatabaseManager:
 
         except Exception as e:
             session.rollback()
-            print(f"Database error persisting credential: {e}")
+            applogger.critical(f"Database error persisting credential: {e}")
             return None
         finally:
             self.close_session()
@@ -236,7 +239,8 @@ class DatabaseManager:
             last_analysis: timestamp of last analysis
 
         """
-        print(f"Analyzed metrics {analyzed_metrics}, category {category}, category scores {category_scores}, last analysis {last_analysis}")
+        applogger.debug(f"Analyzed metrics {analyzed_metrics}, category {category}, category scores {category_scores}, last analysis {last_analysis}")
+        applogger.info(f"IP: {ip} category has been updated to {category}")
 
         session = self.session
         sanitized_ip = sanitize_ip(ip)
@@ -295,7 +299,7 @@ class DatabaseManager:
             session.commit()
         except Exception as e:
             session.rollback()
-            print(f"Error recording category change: {e}")
+            applogger.error(f"Error recording category change: {e}")
 
     def get_category_history(self, ip: str) -> List[Dict[str, Any]]:
         """