thomasciesla/JTL-WAFI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix request log

Browse Source
This commit is contained in:
Thomas Ciesla
2026-01-09 16:03:54 +01:00
parent 656f53c024
commit 7db8997e2f
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
jtl-wafi-agent.py
View File

@@ -1613,10 +1613,13 @@ def _load_initial_request_details(tracker: LiveStatsTracker, shop: str, max_line
except Exception: except Exception:
continue continue
logger.info(f"Initiale Request-Details für {shop} geladen: {len(tracker.ip_request_details)} IPs") total_requests = sum(len(reqs) for reqs in tracker.ip_request_details.values())
logger.info(f"Initiale Request-Details für {shop} geladen: {len(tracker.ip_request_details)} IPs, {total_requests} Requests total")
except Exception as e: except Exception as e:
logger.warning(f"Fehler beim Laden der initialen Request-Details für {shop}: {e}") logger.warning(f"Fehler beim Laden der initialen Request-Details für {shop}: {e}")
import traceback
logger.debug(traceback.format_exc())
# ============================================================================= # =============================================================================
@@ -4637,20 +4640,29 @@ class JTLWAFiAgent:
# WHOIS-Lookup durchführen (wird gecacht) # WHOIS-Lookup durchführen (wird gecacht)
result = whois_lookup(ip) result = whois_lookup(ip)
# Request-Historie für diese IP sammeln (aus allen Shops wenn kein Shop angegeben) # Request-Historie für diese IP sammeln
requests = [] requests = []
if shop:
tracker = get_shop_stats_tracker(shop) # Shops ermitteln - entweder spezifischer Shop oder alle aktiven
requests = tracker.get_ip_requests(ip) # Alle Requests shops_to_check = []
if shop and shop.strip():
shops_to_check = [shop]
else: else:
# Aus allen aktiven Shops sammeln # Alle aktiven Shops durchsuchen
for s in list(_shop_stats_trackers.keys()): shops_to_check = list(get_active_shops())
tracker = get_shop_stats_tracker(s)
shop_requests = tracker.get_ip_requests(ip) # Alle Requests logger.debug(f"WHOIS für {ip}: Prüfe {len(shops_to_check)} Shops: {shops_to_check}")
for r in shop_requests:
r['shop'] = s for s in shops_to_check:
requests.extend(shop_requests) tracker = get_shop_stats_tracker(s)
# Nach Zeit sortieren (neueste zuerst) shop_requests = tracker.get_ip_requests(ip)
logger.debug(f"Shop {s}: {len(shop_requests)} Requests für IP {ip}, Tracker hat {len(tracker.ip_request_details)} IPs")
for r in shop_requests:
r['shop'] = s
requests.extend(shop_requests)
# Nach Zeit sortieren (neueste zuerst)
if requests:
requests.sort(key=lambda x: x['ts'], reverse=True) requests.sort(key=lambda x: x['ts'], reverse=True)
# Ergebnis senden # Ergebnis senden