4. Versuch mit mehr Debug ausgeben
This commit is contained in:
1 parent
84aa7f9631
commit
572a881f72
8 files changed
+516
-4
No files matched your search
@@ -7,6 +7,7 @@ Firebase-Konfiguration vollständig startet.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import hashlib
|
||||
import json
|
||||
import logging
|
||||
import threading
|
||||
@@ -190,6 +191,24 @@ class FcmService:
|
||||
raise FileNotFoundError(f'Service-Account-Datei fehlt: {path}')
|
||||
return credentials.Certificate(str(path))
|
||||
|
||||
@staticmethod
|
||||
def _token_fingerprint(token):
|
||||
"""Verkürzter, stabiler Token-Fingerabdruck für Logs (kein Klartext)."""
|
||||
if not token:
|
||||
return '-'
|
||||
return hashlib.sha256(str(token).encode('utf-8')).hexdigest()[:12]
|
||||
|
||||
@staticmethod
|
||||
def _describe_send_error(token, exception):
|
||||
"""Formatiert einen FCM-Fehler und entfernt das Token aus dem Text."""
|
||||
name = type(exception).__name__ if exception is not None else 'UnknownError'
|
||||
text = str(exception or '').strip()
|
||||
if token:
|
||||
text = text.replace(str(token), '<token>')
|
||||
if text:
|
||||
return f'{name}: {text}'
|
||||
return name
|
||||
|
||||
def send_wake(self, tokens, reason='wake'):
|
||||
"""Sendet ein reines Daten-Signal an die angegebenen FCM-Tokens.
|
||||
|
||||
@@ -205,6 +224,7 @@ class FcmService:
|
||||
'failed': 0,
|
||||
'sent_tokens': [],
|
||||
'invalid_tokens': [],
|
||||
'errors': [],
|
||||
}
|
||||
if not tokens:
|
||||
return result
|
||||
@@ -246,6 +266,9 @@ class FcmService:
|
||||
result['failed'] += batch_result['failed']
|
||||
result['sent_tokens'].extend(batch_result['sent_tokens'])
|
||||
result['invalid_tokens'].extend(batch_result['invalid_tokens'])
|
||||
result['errors'].extend(batch_result['errors'])
|
||||
if batch_result.get('error'):
|
||||
result['error'] = batch_result['error']
|
||||
|
||||
return result
|
||||
|
||||
@@ -255,6 +278,7 @@ class FcmService:
|
||||
'failed': 0,
|
||||
'sent_tokens': [],
|
||||
'invalid_tokens': [],
|
||||
'errors': [],
|
||||
}
|
||||
message = messaging.MulticastMessage(
|
||||
tokens=tokens,
|
||||
@@ -266,8 +290,17 @@ class FcmService:
|
||||
response = messaging.send_each_for_multicast(message)
|
||||
responses = list(response.responses)
|
||||
except Exception as exc:
|
||||
logger.warning('FCM-Batchversand fehlgeschlagen: %s', exc)
|
||||
details = self._describe_send_error(None, exc)
|
||||
logger.warning(
|
||||
'FCM-Batchversand fehlgeschlagen (%s Empfänger): %s',
|
||||
len(tokens), details
|
||||
)
|
||||
batch_result['failed'] += len(tokens)
|
||||
batch_result['error'] = details
|
||||
batch_result['errors'].append({
|
||||
'fingerprint': '-',
|
||||
'error': details,
|
||||
})
|
||||
return batch_result
|
||||
|
||||
for token, send_response in zip(tokens, responses):
|
||||
@@ -277,6 +310,16 @@ class FcmService:
|
||||
continue
|
||||
batch_result['failed'] += 1
|
||||
exception = send_response.exception
|
||||
details = self._describe_send_error(token, exception)
|
||||
fingerprint = self._token_fingerprint(token)
|
||||
logger.warning(
|
||||
'FCM-Signal abgelehnt: token=%s error=%s',
|
||||
fingerprint, details
|
||||
)
|
||||
batch_result['errors'].append({
|
||||
'fingerprint': fingerprint,
|
||||
'error': details,
|
||||
})
|
||||
text = str(exception or '').upper()
|
||||
if (
|
||||
isinstance(exception, messaging.UnregisteredError)
|
||||
|
||||
Reference in new issue
Block a user