FCM: Diagnose in eigenes Tageslog schreiben
This commit is contained in:
1 parent
94d8db2e7c
commit
d2be8e0d69
7 files changed
+136
No files matched your search
@@ -154,6 +154,7 @@ class FcmService:
|
||||
'Bitte requirements.txt installieren.'
|
||||
)
|
||||
logger.warning(self._error)
|
||||
self._log_debug({'event': 'init-error', 'error': self._error})
|
||||
return None, self._error
|
||||
|
||||
try:
|
||||
@@ -173,6 +174,7 @@ class FcmService:
|
||||
except Exception as exc:
|
||||
self._error = f'FCM-Initialisierung fehlgeschlagen: {exc}'
|
||||
logger.exception(self._error)
|
||||
self._log_debug({'event': 'init-error', 'error': self._error})
|
||||
return None, self._error
|
||||
|
||||
return self._app, None
|
||||
@@ -209,6 +211,22 @@ class FcmService:
|
||||
return f'{name}: {text}'
|
||||
return name
|
||||
|
||||
@staticmethod
|
||||
def _log_debug(payload):
|
||||
"""Schreibt eine FCM-Diagnosezeile in das separate FCM-Log."""
|
||||
tenant_id = None
|
||||
try:
|
||||
from flask import g
|
||||
tenant_id = getattr(g, 'tenant_id', None)
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
from cmbnet.core.logging import write_fcm_debug_log
|
||||
write_fcm_debug_log(payload, tenant_id=tenant_id)
|
||||
except Exception:
|
||||
# Diagnose darf den Versand nie beeinflussen.
|
||||
pass
|
||||
|
||||
def send_wake(self, tokens, reason='wake'):
|
||||
"""Sendet ein reines Daten-Signal an die angegebenen FCM-Tokens.
|
||||
|
||||
@@ -232,6 +250,14 @@ class FcmService:
|
||||
app, error = self._ensure_app()
|
||||
if error or app is None:
|
||||
result['error'] = error
|
||||
self._log_debug({
|
||||
'event': 'wake',
|
||||
'reason': reason,
|
||||
'requested': len(tokens),
|
||||
'sent': 0,
|
||||
'failed': 0,
|
||||
'error': error,
|
||||
})
|
||||
return result
|
||||
|
||||
result['configured'] = True
|
||||
@@ -270,6 +296,15 @@ class FcmService:
|
||||
if batch_result.get('error'):
|
||||
result['error'] = batch_result['error']
|
||||
|
||||
self._log_debug({
|
||||
'event': 'wake',
|
||||
'reason': reason,
|
||||
'requested': len(tokens),
|
||||
'sent': result['sent'],
|
||||
'failed': result['failed'],
|
||||
'errors': result['errors'][:5],
|
||||
'error': result.get('error'),
|
||||
})
|
||||
return result
|
||||
|
||||
def _send_batch(self, messaging, tokens, data, android, webpush, app=None):
|
||||
@@ -300,6 +335,11 @@ class FcmService:
|
||||
'FCM-Batchversand fehlgeschlagen (%s Empfänger): %s',
|
||||
len(tokens), details
|
||||
)
|
||||
self._log_debug({
|
||||
'event': 'batch-error',
|
||||
'recipients': len(tokens),
|
||||
'error': details,
|
||||
})
|
||||
batch_result['failed'] += len(tokens)
|
||||
batch_result['error'] = details
|
||||
batch_result['errors'].append({
|
||||
@@ -321,6 +361,11 @@ class FcmService:
|
||||
'FCM-Signal abgelehnt: token=%s error=%s',
|
||||
fingerprint, details
|
||||
)
|
||||
self._log_debug({
|
||||
'event': 'rejected',
|
||||
'token': fingerprint,
|
||||
'error': details,
|
||||
})
|
||||
batch_result['errors'].append({
|
||||
'fingerprint': fingerprint,
|
||||
'error': details,
|
||||
|
||||
Reference in new issue
Block a user