WebSocket stabiler gemacht mit Puffern beim Broker
This commit is contained in:
1 parent
12523ddd0a
commit
c793e8b16d
10 files changed
+533
-37
No files matched your search
@@ -19,6 +19,7 @@ class HeartbeatManager:
|
||||
self.running = False
|
||||
self.app = None
|
||||
self._timer = None
|
||||
self._presence_timer = None
|
||||
|
||||
def start(self, app=None, interval=None):
|
||||
"""Startet die zyklische Heartbeat-Routine."""
|
||||
@@ -33,13 +34,34 @@ class HeartbeatManager:
|
||||
return
|
||||
self.running = True
|
||||
self._send_heartbeat()
|
||||
self._check_presence()
|
||||
|
||||
def stop(self):
|
||||
"""Stoppt die Heartbeat-Routine."""
|
||||
self.running = False
|
||||
if self._timer is not None:
|
||||
self._timer.cancel()
|
||||
self._timer = None
|
||||
for timer in (self._timer, self._presence_timer):
|
||||
if timer is not None:
|
||||
timer.cancel()
|
||||
self._timer = None
|
||||
self._presence_timer = None
|
||||
|
||||
def _check_presence(self):
|
||||
"""Prüft die Code-2-Lebenszeichen der Gruppen unabhängig vom Heartbeat."""
|
||||
if not self.running:
|
||||
return
|
||||
|
||||
if self.app is not None:
|
||||
try:
|
||||
with self.app.app_context():
|
||||
broker.check_group_presence_timeouts()
|
||||
except Exception as exc:
|
||||
print(f'Group presence check error: {exc}')
|
||||
|
||||
# Kürzer als das Zwei-Minuten-Fenster prüfen, damit der Status
|
||||
# zeitnah auf "unterwegs" wechselt.
|
||||
self._presence_timer = Timer(15, self._check_presence)
|
||||
self._presence_timer.daemon = True
|
||||
self._presence_timer.start()
|
||||
|
||||
def _send_heartbeat(self):
|
||||
if not self.running:
|
||||
@@ -49,20 +71,16 @@ class HeartbeatManager:
|
||||
|
||||
# Nur authentifizierte Verbindungen erhalten einen Heartbeat.
|
||||
for tenant_id, connections in list(broker.connections.items()):
|
||||
for account_id, conn_info in list(connections.items()):
|
||||
for account_id in list(connections):
|
||||
if not broker.is_authenticated(tenant_id, account_id):
|
||||
continue
|
||||
try:
|
||||
conn_info['ws'].send(msg.to_json())
|
||||
except Exception:
|
||||
# Defekte Verbindungen werden beim Schließen durch die
|
||||
# WebSocket-Route entfernt.
|
||||
pass
|
||||
broker.send_to_connection(tenant_id, account_id, msg.to_json())
|
||||
|
||||
# Abgelaufene persistierte Nachrichten löschen.
|
||||
# Abgelaufene persistierte Nachrichten und Sitzungs-Queues löschen.
|
||||
if self.app is not None:
|
||||
try:
|
||||
with self.app.app_context():
|
||||
broker.cleanup_session_queues()
|
||||
broker.cleanup_old_messages()
|
||||
except Exception as exc:
|
||||
print(f'Heartbeat cleanup error: {exc}')
|
||||
|
||||
Reference in new issue
Block a user