added ip logging memory improvements, added local ip and public ip exlusion

src/tasks/memory_cleanup.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+
+"""
+Memory cleanup task for Krawl honeypot.
+Periodically trims unbounded in-memory structures to prevent OOM.
+"""
+
+from database import get_database
+from logger import get_app_logger
+
+# ----------------------
+# TASK CONFIG
+# ----------------------
+
+TASK_CONFIG = {
+    "name": "memory-cleanup",
+    "cron": "*/5 * * * *",  # Run every 5 minutes
+    "enabled": True,
+    "run_when_loaded": False,
+}
+
+app_logger = get_app_logger()
+
+
+def main():
+    """
+    Clean up in-memory structures in the tracker.
+    Called periodically to prevent unbounded memory growth.
+    """
+    try:
+        # Import here to avoid circular imports
+        from handler import Handler
+
+        if not Handler.tracker:
+            app_logger.warning("Tracker not initialized, skipping memory cleanup")
+            return
+
+        # Get memory stats before cleanup
+        stats_before = Handler.tracker.get_memory_stats()
+
+        # Run cleanup
+        Handler.tracker.cleanup_memory()
+
+        # Get memory stats after cleanup
+        stats_after = Handler.tracker.get_memory_stats()
+
+        # Log changes
+        access_log_reduced = stats_before["access_log_size"] - stats_after["access_log_size"]
+        cred_reduced = stats_before["credential_attempts_size"] - stats_after["credential_attempts_size"]
+
+        if access_log_reduced > 0 or cred_reduced > 0:
+            app_logger.info(
+                f"Memory cleanup: Trimmed {access_log_reduced} access logs, "
+                f"{cred_reduced} credential attempts"
+            )
+
+        # Log current memory state for monitoring
+        app_logger.debug(
+            f"Memory stats after cleanup: "
+            f"access_logs={stats_after['access_log_size']}, "
+            f"credentials={stats_after['credential_attempts_size']}, "
+            f"unique_ips={stats_after['unique_ips_tracked']}"
+        )
+
+    except Exception as e:
+        app_logger.error(f"Error during memory cleanup: {e}")

src/tasks/top_attacking_ips.py

@@ -5,7 +5,9 @@ from datetime import datetime, timedelta
 from zoneinfo import ZoneInfo
 from logger import get_app_logger
 from database import get_database
+from config import get_config
 from models import AccessLog
+from ip_utils import is_local_or_private_ip, is_valid_public_ip
 from sqlalchemy import distinct
 
 app_logger = get_app_logger()
@@ -66,16 +68,26 @@ def main():
             .all()
         )
 
+        # Filter out local/private IPs and the server's own IP
+        config = get_config()
+        server_ip = config.get_server_ip()
+        
+        public_ips = [
+            ip for (ip,) in results
+            if is_valid_public_ip(ip, server_ip)
+        ]
+
         # Ensure exports directory exists
         os.makedirs(EXPORTS_DIR, exist_ok=True)
 
         # Write IPs to file (one per line)
         with open(OUTPUT_FILE, "w") as f:
-            for (ip,) in results:
+            for ip in public_ips:
                 f.write(f"{ip}\n")
 
         app_logger.info(
-            f"[Background Task] {task_name} exported {len(results)} IPs to {OUTPUT_FILE}"
+            f"[Background Task] {task_name} exported {len(public_ips)} public IPs "
+            f"(filtered {len(results) - len(public_ips)} local/private IPs) to {OUTPUT_FILE}"
         )
 
     except Exception as e: