bug fix shutdown/reconnect WS resultiert in offline für FCM
This commit is contained in:
1 parent
c51ef02f88
commit
b5f928bf76
11 files changed
+331
-11
No files matched your search
+111
-2
@@ -294,6 +294,61 @@ def get_push_token(tenant_id, client_id):
|
||||
).fetchone()
|
||||
|
||||
|
||||
def touch_worker(worker_id, timestamp=None):
|
||||
"""Aktualisiert das Lebenszeichen eines WSGI-Workers."""
|
||||
if not worker_id:
|
||||
return
|
||||
current = now() if timestamp is None else timestamp
|
||||
db = get_db()
|
||||
db.execute(
|
||||
'''INSERT INTO ws_workers (worker_id, started_at, heartbeat_at)
|
||||
VALUES (?, ?, ?)
|
||||
ON CONFLICT(worker_id) DO UPDATE SET
|
||||
heartbeat_at = excluded.heartbeat_at''',
|
||||
(worker_id, current, current)
|
||||
)
|
||||
db.commit()
|
||||
|
||||
|
||||
def mark_orphan_clients_disconnected(active_since):
|
||||
"""Markiert Clients von nicht mehr lebenden Workern als getrennt.
|
||||
|
||||
Nach einem Neustart bleiben in ``ws_clients`` Einträge mit
|
||||
``disconnected_at IS NULL`` zurück, obwohl die zugehörige Verbindung nur
|
||||
im Speicher des alten Prozesses existierte. Ohne diese Bereinigung würden
|
||||
solche Clients nie als Wake-Kandidaten erscheinen. Clients eines Workers,
|
||||
dessen Heartbeat noch innerhalb von ``active_since`` liegt, bleiben
|
||||
unberührt.
|
||||
"""
|
||||
db = get_db()
|
||||
cursor = db.execute(
|
||||
'''UPDATE ws_clients
|
||||
SET worker_id = NULL, disconnected_at = ?, authenticated = 0
|
||||
WHERE disconnected_at IS NULL
|
||||
AND (
|
||||
worker_id IS NULL
|
||||
OR NOT EXISTS (
|
||||
SELECT 1 FROM ws_workers w
|
||||
WHERE w.worker_id = ws_clients.worker_id
|
||||
AND w.heartbeat_at >= ?
|
||||
)
|
||||
)''',
|
||||
(now(), active_since)
|
||||
)
|
||||
db.commit()
|
||||
return cursor.rowcount
|
||||
|
||||
|
||||
def cleanup_worker_registry(max_age_seconds):
|
||||
"""Entfernt Lebenszeichen-Einträge beendeter Worker."""
|
||||
db = get_db()
|
||||
db.execute(
|
||||
'DELETE FROM ws_workers WHERE heartbeat_at < ?',
|
||||
(now() - max_age_seconds,)
|
||||
)
|
||||
db.commit()
|
||||
|
||||
|
||||
def mark_push_token_invalid(token):
|
||||
"""Markiert ein von FCM abgelehntes Token als ungültig."""
|
||||
db = get_db()
|
||||
@@ -323,7 +378,7 @@ def _offline_mobile_wake_query(tenant_id, disconnected_before,
|
||||
LIMIT 1
|
||||
)
|
||||
WHERE c.tenant_id = ?
|
||||
AND c.client_type IN ('group_view', 'dispatcher_mobile')
|
||||
AND p.client_type IN ('group_view', 'dispatcher_mobile')
|
||||
AND c.disconnected_at IS NOT NULL
|
||||
AND c.disconnected_at <= ?'''
|
||||
]
|
||||
@@ -423,8 +478,47 @@ def claim_offline_mobile_wakes(tenant_id, disconnected_before,
|
||||
raise
|
||||
|
||||
|
||||
def mobile_push_stats(tenant_id):
|
||||
"""Liefert Diagnosezahlen für den manuellen FCM-Wake.
|
||||
|
||||
``valid_tokens`` zählt registrierte, nicht von FCM abgelehnte Tokens
|
||||
mobiler Webviews. ``connected`` zählt die davon aktuell als verbunden
|
||||
geltenden Clients. Damit lässt sich in der Oberfläche unterscheiden, ob
|
||||
die Registrierung oder die Offline-Erkennung das Problem ist.
|
||||
"""
|
||||
db = get_db()
|
||||
valid_tokens = db.execute(
|
||||
'''SELECT COUNT(*) FROM ws_push_tokens
|
||||
WHERE tenant_id = ? AND invalid = 0
|
||||
AND client_type IN ('group_view', 'dispatcher_mobile')''',
|
||||
(tenant_id,)
|
||||
).fetchone()[0]
|
||||
connected = db.execute(
|
||||
'''SELECT COUNT(DISTINCT c.client_id)
|
||||
FROM ws_clients c
|
||||
JOIN ws_push_tokens p
|
||||
ON p.tenant_id = c.tenant_id
|
||||
AND p.client_id = c.client_id
|
||||
AND p.invalid = 0
|
||||
WHERE c.tenant_id = ?
|
||||
AND p.client_type IN ('group_view', 'dispatcher_mobile')
|
||||
AND c.disconnected_at IS NULL''',
|
||||
(tenant_id,)
|
||||
).fetchone()[0]
|
||||
return {
|
||||
'valid_tokens': int(valid_tokens or 0),
|
||||
'connected': int(connected or 0),
|
||||
}
|
||||
|
||||
|
||||
def cleanup_orphan_push_tokens(max_age_seconds):
|
||||
"""Entfernt ungültige sowie verwaiste, lange nicht aktualisierte Tokens."""
|
||||
"""Entfernt ungültige sowie veraltete, nicht mehr verbundene Tokens.
|
||||
|
||||
Tokens von aktuell verbundenen Clients bleiben erhalten, auch wenn die
|
||||
Registrierung länger zurückliegt. Getrennte Tokens werden erst nach der
|
||||
(bewusst großzügigen) Aufbewahrungsfrist entfernt, damit auch über Nacht
|
||||
schlafende Mobilgeräte noch geweckt werden können.
|
||||
"""
|
||||
db = get_db()
|
||||
cutoff = now() - max_age_seconds
|
||||
db.execute(
|
||||
@@ -437,6 +531,7 @@ def cleanup_orphan_push_tokens(max_age_seconds):
|
||||
SELECT 1 FROM ws_clients c
|
||||
WHERE c.tenant_id = ws_push_tokens.tenant_id
|
||||
AND c.client_id = ws_push_tokens.client_id
|
||||
AND c.disconnected_at IS NULL
|
||||
)''',
|
||||
(cutoff,)
|
||||
)
|
||||
@@ -713,6 +808,20 @@ def cleanup_clients(retention_seconds):
|
||||
'DELETE FROM ws_client_queue WHERE tenant_id = ? AND client_id = ?',
|
||||
(tenant_id, client_id)
|
||||
)
|
||||
|
||||
# Ein gültiges FCM-Token hält den Client-Eintrag am Leben. Sonst
|
||||
# würden schlafende Mobilgeräte schon nach der kurzen
|
||||
# Client-Aufbewahrung samt Token verschwinden und könnten nie wieder
|
||||
# geweckt werden. Das Token selbst wird über
|
||||
# ``cleanup_orphan_push_tokens`` mit eigener Frist aufgeräumt.
|
||||
has_push_token = db.execute(
|
||||
'SELECT 1 FROM ws_push_tokens '
|
||||
'WHERE tenant_id = ? AND client_id = ? AND invalid = 0 LIMIT 1',
|
||||
(tenant_id, client_id)
|
||||
).fetchone()
|
||||
if has_push_token is not None:
|
||||
continue
|
||||
|
||||
db.execute(
|
||||
'DELETE FROM ws_push_tokens WHERE tenant_id = ? AND client_id = ?',
|
||||
(tenant_id, client_id)
|
||||
|
||||
Reference in new issue
Block a user