mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-11-17 19:16:25 +00:00
Update health_persistence.py
This commit is contained in:
@@ -90,14 +90,25 @@ class HealthPersistence:
|
|||||||
now = datetime.now().isoformat()
|
now = datetime.now().isoformat()
|
||||||
details_json = json.dumps(details) if details else None
|
details_json = json.dumps(details) if details else None
|
||||||
|
|
||||||
# Check if error exists
|
cursor.execute('''
|
||||||
cursor.execute('SELECT id, first_seen, notification_sent FROM errors WHERE error_key = ?',
|
SELECT id, first_seen, notification_sent, acknowledged, resolved_at
|
||||||
(error_key,))
|
FROM errors WHERE error_key = ?
|
||||||
|
''', (error_key,))
|
||||||
existing = cursor.fetchone()
|
existing = cursor.fetchone()
|
||||||
|
|
||||||
event_info = {'type': 'updated', 'needs_notification': False}
|
event_info = {'type': 'updated', 'needs_notification': False}
|
||||||
|
|
||||||
if existing:
|
if existing:
|
||||||
|
error_id, first_seen, notif_sent, acknowledged, resolved_at = existing
|
||||||
|
|
||||||
|
# If acknowledged within last 24 hours, do not re-add unless resolved and re-occurred
|
||||||
|
if acknowledged and not resolved_at:
|
||||||
|
first_seen_dt = datetime.fromisoformat(first_seen)
|
||||||
|
if (datetime.now() - first_seen_dt).total_seconds() < 86400: # 24 hours
|
||||||
|
# Skip re-adding recently acknowledged errors
|
||||||
|
conn.close()
|
||||||
|
return {'type': 'skipped', 'needs_notification': False}
|
||||||
|
|
||||||
# Update existing error
|
# Update existing error
|
||||||
cursor.execute('''
|
cursor.execute('''
|
||||||
UPDATE errors
|
UPDATE errors
|
||||||
@@ -151,15 +162,20 @@ class HealthPersistence:
|
|||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
def acknowledge_error(self, error_key: str):
|
def acknowledge_error(self, error_key: str):
|
||||||
"""Manually acknowledge an error (won't notify again)"""
|
"""
|
||||||
|
Manually acknowledge an error (won't notify again or re-appear for 24h).
|
||||||
|
Also marks as resolved so it disappears from active errors.
|
||||||
|
"""
|
||||||
conn = sqlite3.connect(str(self.db_path))
|
conn = sqlite3.connect(str(self.db_path))
|
||||||
cursor = conn.cursor()
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
now = datetime.now().isoformat()
|
||||||
|
|
||||||
cursor.execute('''
|
cursor.execute('''
|
||||||
UPDATE errors
|
UPDATE errors
|
||||||
SET acknowledged = 1
|
SET acknowledged = 1, resolved_at = ?
|
||||||
WHERE error_key = ?
|
WHERE error_key = ?
|
||||||
''', (error_key,))
|
''', (now, error_key))
|
||||||
|
|
||||||
self._record_event(cursor, 'acknowledged', error_key, {})
|
self._record_event(cursor, 'acknowledged', error_key, {})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user