FCM: Debug-Popup und doppelte Diagnoseausgaben entfernen
This commit is contained in:
1 parent
d2be8e0d69
commit
b53dd11f1c
6 files changed
+15
-141
No files matched your search
@@ -77,13 +77,6 @@ def register_push_token(**kwargs):
|
||||
'FCM-Token registriert: tenant=%s client=%s type=%s',
|
||||
g.tenant_id, client_id, client_type
|
||||
)
|
||||
write_fcm_debug_log({
|
||||
'event': 'token-registered',
|
||||
'client_id': client_id,
|
||||
'account_id': account_id,
|
||||
'client_type': client_type,
|
||||
'platform': _platform_name(data.get('platform')),
|
||||
}, tenant_id=g.tenant_id)
|
||||
return jsonify({'ok': True})
|
||||
|
||||
|
||||
@@ -197,11 +190,6 @@ def wake_mobile_clients(**kwargs):
|
||||
int(result.get('failed') or 0)
|
||||
)
|
||||
error_details = list(result.get('errors') or [])[:5]
|
||||
for item in error_details:
|
||||
current_app.logger.warning(
|
||||
'FCM-Wake-Fehler: tenant=%s token=%s error=%s',
|
||||
g.tenant_id, item.get('fingerprint'), item.get('error')
|
||||
)
|
||||
write_fcm_debug_log({
|
||||
'event': 'wake-manual',
|
||||
'group_id': group_id,
|
||||
|
||||
@@ -154,7 +154,6 @@ class FcmService:
|
||||
'Bitte requirements.txt installieren.'
|
||||
)
|
||||
logger.warning(self._error)
|
||||
self._log_debug({'event': 'init-error', 'error': self._error})
|
||||
return None, self._error
|
||||
|
||||
try:
|
||||
@@ -174,7 +173,6 @@ 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
|
||||
@@ -211,22 +209,6 @@ 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.
|
||||
|
||||
@@ -250,14 +232,6 @@ 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
|
||||
@@ -296,15 +270,6 @@ 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):
|
||||
@@ -335,11 +300,6 @@ 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({
|
||||
@@ -361,11 +321,6 @@ 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