summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/sync.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-14 15:19:37 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-14 15:19:37 +0000
commit2acae8300fa272caeb774f24d19b80632eca7ae3 (patch)
tree6f78cfadb93cb03f3cde012805ff2a0ee8f61b0d /synapse/rest/client/v2_alpha/sync.py
parentAdd commentary for fix in PR#442 (diff)
downloadsynapse-2acae8300fa272caeb774f24d19b80632eca7ae3.tar.xz
Fix logging to lie less
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index adf77e13bf..b16831246d 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -351,8 +351,6 @@ class SyncRestServlet(RestServlet):
                 continue
 
             prev_event_id = timeline_event.unsigned.get("replaces_state", None)
-            logger.debug("Replacing %s with %s in state dict",
-                         timeline_event.event_id, prev_event_id)
 
             prev_content = timeline_event.unsigned.get('prev_content')
             prev_sender = timeline_event.unsigned.get('prev_sender')
@@ -363,8 +361,17 @@ class SyncRestServlet(RestServlet):
             # If this is the case the we ignore the previous event. This will
             # cause the displayname calculations on the client to be incorrect
             if prev_event_id is None or not prev_content or not prev_sender:
+                logger.debug(
+                    "Removing %r from the state dict, as it is missing "
+                    " prev_content (prev_event_id=%r)",
+                    timeline_event.event_id, prev_event_id
+                )
                 del result[event_key]
             else:
+                logger.debug(
+                    "Replacing %r with %r in state dict",
+                    timeline_event.event_id, prev_event_id
+                )
                 result[event_key] = FrozenEvent({
                     "type": timeline_event.type,
                     "state_key": timeline_event.state_key,