Malin/krawl.es
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: optimize access log query to count unique entries and improve pagination

Browse Source
This commit is contained in:
Lorenzo Venerandi
2026-02-17 18:13:25 +01:00
parent 846fba631f
commit cccc9cde35
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/database.py
View File

@@ -1644,11 +1644,16 @@ class DatabaseManager:
sort_order.lower() if sort_order.lower() in {"asc", "desc"} else "desc" sort_order.lower() if sort_order.lower() in {"asc", "desc"} else "desc"
) )
# Count total attacks first (efficient) # Count total unique access logs with attack detections
total_attacks = session.query(AccessLog).join(AttackDetection).count() total_attacks = (
session.query(AccessLog)
.join(AttackDetection)
.distinct(AccessLog.id)
.count()
)
# Get paginated access logs with attack detections # Get paginated access logs with attack detections
query = session.query(AccessLog).join(AttackDetection) query = session.query(AccessLog).join(AttackDetection).distinct(AccessLog.id)
if sort_by == "timestamp": if sort_by == "timestamp":
query = query.order_by( query = query.order_by(
@@ -1660,9 +1665,6 @@ class DatabaseManager:
query = query.order_by( query = query.order_by(
AccessLog.ip.desc() if sort_order == "desc" else AccessLog.ip.asc() AccessLog.ip.desc() if sort_order == "desc" else AccessLog.ip.asc()
) )
# Note: attack_type sorting requires loading all data, so we skip it for performance
# elif sort_by == "attack_type":
# Can't efficiently sort by related table field
# Apply LIMIT and OFFSET at database level # Apply LIMIT and OFFSET at database level
logs = query.offset(offset).limit(page_size).all() logs = query.offset(offset).limit(page_size).all()