mirror of
https://git.quad4.io/RNS-Things/MeshChatX.git
synced 2026-10-24 05:42:57 +00:00
refactor(meshchat): clean up code formatting and enhance version retrieval for LXST; improve log handling and anomaly detection logic
This commit is contained in:
6 files changed
+85
-52
No files matched your search
@@ -14,11 +14,11 @@ class PersistentLogHandler(logging.Handler):
|
||||
self.last_flush_time = time.time()
|
||||
self.lock = threading.RLock()
|
||||
self.flush_lock = threading.Lock()
|
||||
|
||||
|
||||
# Anomaly detection state
|
||||
self.recent_messages = collections.deque(maxlen=100)
|
||||
self.flooding_threshold = 20 # messages per second
|
||||
self.repeat_threshold = 5 # identical messages in a row
|
||||
self.repeat_threshold = 5 # identical messages in a row
|
||||
self.message_counts = collections.defaultdict(int)
|
||||
self.last_reset_time = time.time()
|
||||
|
||||
@@ -30,9 +30,9 @@ class PersistentLogHandler(logging.Handler):
|
||||
try:
|
||||
msg = self.format(record)
|
||||
timestamp = datetime.now(UTC).timestamp()
|
||||
|
||||
|
||||
is_anomaly, anomaly_type = self._detect_anomaly(record, msg, timestamp)
|
||||
|
||||
|
||||
log_entry = {
|
||||
"timestamp": timestamp,
|
||||
"level": record.levelname,
|
||||
@@ -41,29 +41,35 @@ class PersistentLogHandler(logging.Handler):
|
||||
"is_anomaly": 1 if is_anomaly else 0,
|
||||
"anomaly_type": anomaly_type,
|
||||
}
|
||||
|
||||
|
||||
with self.lock:
|
||||
self.logs_buffer.append(log_entry)
|
||||
|
||||
|
||||
# Periodically flush to database if available
|
||||
if self.database and (time.time() - self.last_flush_time > self.flush_interval):
|
||||
if self.database and (
|
||||
time.time() - self.last_flush_time > self.flush_interval
|
||||
):
|
||||
self._flush_to_db()
|
||||
|
||||
|
||||
except Exception:
|
||||
self.handleError(record)
|
||||
|
||||
def _detect_anomaly(self, record, message, timestamp):
|
||||
# Only detect anomalies for WARNING level and above
|
||||
if record.levelno < logging.WARNING:
|
||||
return False, None
|
||||
|
||||
now = time.time()
|
||||
|
||||
|
||||
# 1. Detect Log Flooding
|
||||
if now - self.last_reset_time > 1.0:
|
||||
self.message_counts.clear()
|
||||
self.last_reset_time = now
|
||||
|
||||
|
||||
self.message_counts["total"] += 1
|
||||
if self.message_counts["total"] > self.flooding_threshold:
|
||||
return True, "flooding"
|
||||
|
||||
|
||||
# 2. Detect Repeats
|
||||
if len(self.recent_messages) > 0:
|
||||
repeat_count = 0
|
||||
@@ -72,17 +78,17 @@ class PersistentLogHandler(logging.Handler):
|
||||
repeat_count += 1
|
||||
else:
|
||||
break
|
||||
|
||||
|
||||
if repeat_count >= self.repeat_threshold:
|
||||
return True, "repeat"
|
||||
|
||||
|
||||
self.recent_messages.append(message)
|
||||
return False, None
|
||||
|
||||
def _flush_to_db(self):
|
||||
if not self.database:
|
||||
return
|
||||
|
||||
|
||||
# Ensure only one thread flushes at a time
|
||||
if not self.flush_lock.acquire(blocking=False):
|
||||
return
|
||||
@@ -92,7 +98,7 @@ class PersistentLogHandler(logging.Handler):
|
||||
with self.lock:
|
||||
while self.logs_buffer:
|
||||
items_to_flush.append(self.logs_buffer.popleft())
|
||||
|
||||
|
||||
if not items_to_flush:
|
||||
return
|
||||
|
||||
@@ -104,49 +110,60 @@ class PersistentLogHandler(logging.Handler):
|
||||
module=entry["module"],
|
||||
message=entry["message"],
|
||||
is_anomaly=entry["is_anomaly"],
|
||||
anomaly_type=entry["anomaly_type"]
|
||||
anomaly_type=entry["anomaly_type"],
|
||||
)
|
||||
except Exception as e:
|
||||
print(f"Error inserting log: {e}")
|
||||
|
||||
# Periodic cleanup of old logs (only every 100 flushes or similar?
|
||||
|
||||
# Periodic cleanup of old logs (only every 100 flushes or similar?
|
||||
# for now let's just keep it here but it should be fast)
|
||||
try:
|
||||
self.database.debug_logs.cleanup_old_logs()
|
||||
except Exception as e:
|
||||
print(f"Error cleaning up logs: {e}")
|
||||
|
||||
|
||||
self.last_flush_time = time.time()
|
||||
except Exception as e:
|
||||
print(f"Failed to flush logs to database: {e}")
|
||||
finally:
|
||||
self.flush_lock.release()
|
||||
|
||||
def get_logs(self, limit=100, offset=0, search=None, level=None, module=None, is_anomaly=None):
|
||||
def get_logs(
|
||||
self, limit=100, offset=0, search=None, level=None, module=None, is_anomaly=None
|
||||
):
|
||||
if self.database:
|
||||
# Flush current buffer first to ensure we have latest logs
|
||||
self._flush_to_db()
|
||||
|
||||
|
||||
with self.lock:
|
||||
if self.database:
|
||||
return self.database.debug_logs.get_logs(
|
||||
limit=limit,
|
||||
offset=offset,
|
||||
search=search,
|
||||
level=level,
|
||||
module=module,
|
||||
is_anomaly=is_anomaly
|
||||
limit=limit,
|
||||
offset=offset,
|
||||
search=search,
|
||||
level=level,
|
||||
module=module,
|
||||
is_anomaly=is_anomaly,
|
||||
)
|
||||
else:
|
||||
# Fallback to in-memory buffer if DB not yet available
|
||||
logs = list(self.logs_buffer)
|
||||
if search:
|
||||
logs = [l for l in logs if search.lower() in l["message"].lower() or search.lower() in l["module"].lower()]
|
||||
logs = [
|
||||
log
|
||||
for log in logs
|
||||
if search.lower() in log["message"].lower()
|
||||
or search.lower() in log["module"].lower()
|
||||
]
|
||||
if level:
|
||||
logs = [l for l in logs if l["level"] == level]
|
||||
logs = [log for log in logs if log["level"] == level]
|
||||
if is_anomaly is not None:
|
||||
logs = [l for l in logs if l["is_anomaly"] == (1 if is_anomaly else 0)]
|
||||
|
||||
logs = [
|
||||
log
|
||||
for log in logs
|
||||
if log["is_anomaly"] == (1 if is_anomaly else 0)
|
||||
]
|
||||
|
||||
# Sort descending
|
||||
logs.sort(key=lambda x: x["timestamp"], reverse=True)
|
||||
return logs[offset : offset + limit]
|
||||
@@ -155,11 +172,7 @@ class PersistentLogHandler(logging.Handler):
|
||||
with self.lock:
|
||||
if self.database:
|
||||
return self.database.debug_logs.get_total_count(
|
||||
search=search,
|
||||
level=level,
|
||||
module=module,
|
||||
is_anomaly=is_anomaly
|
||||
search=search, level=level, module=module, is_anomaly=is_anomaly
|
||||
)
|
||||
else:
|
||||
return len(self.logs_buffer)
|
||||
|
||||
Reference in new issue
Block a user