summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-05 10:35:40 +0100
committerGitHub <noreply@github.com>2019-06-05 10:35:40 +0100
commit2615c6bd9e5456c5aefc23a9c89a4346b8afc6b0 (patch)
tree95c44526b58c19dbfe75804d850a4dfff0daaf21 /synapse/federation
parentRename VerifyKeyRequest.deferred field (#5343) (diff)
downloadsynapse-2615c6bd9e5456c5aefc23a9c89a4346b8afc6b0.tar.xz
Clean up debug logging (#5347)
Remove some spurious stuff, clarify some other stuff
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/federation_client.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index d559605382..70573746d6 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -232,7 +232,8 @@ class FederationClient(FederationBase):
                 moving to the next destination. None indicates no timeout.
 
         Returns:
-            Deferred: Results in the requested PDU.
+            Deferred: Results in the requested PDU, or None if we were unable to find
+               it.
         """
 
         # TODO: Rate limit the number of times we try and get the same event.
@@ -257,7 +258,12 @@ class FederationClient(FederationBase):
                     destination, event_id, timeout=timeout,
                 )
 
-                logger.debug("transaction_data %r", transaction_data)
+                logger.debug(
+                    "retrieved event id %s from %s: %r",
+                    event_id,
+                    destination,
+                    transaction_data,
+                )
 
                 pdu_list = [
                     event_from_pdu_json(p, format_ver, outlier=outlier)
@@ -331,7 +337,11 @@ class FederationClient(FederationBase):
             )
 
             if failed_to_fetch:
-                logger.warn("Failed to get %r", failed_to_fetch)
+                logger.warning(
+                    "Failed to fetch missing state/auth events for %s: %s",
+                    room_id,
+                    failed_to_fetch
+                )
 
             event_map = {
                 ev.event_id: ev for ev in fetched_events