summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-27 17:25:44 +0100
committerErik Johnston <erik@matrix.org>2017-04-27 17:25:44 +0100
commit46826bb078ac72ac8aea0d76c9e1c1f2ad29df97 (patch)
tree22e13a6902642ccdf9962e0ca671f509e40e9de7
parentFix tests (diff)
downloadsynapse-46826bb078ac72ac8aea0d76c9e1c1f2ad29df97.tar.xz
Comment and remove spurious logging
Diffstat (limited to '')
-rw-r--r--synapse/events/utils.py3
-rw-r--r--synapse/rest/client/v2_alpha/sync.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index c42b73d11a..824f4a42e3 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -266,6 +266,9 @@ def serialize_event(e, time_now_ms, as_client_event=True,
             if txn_id is not None:
                 d["unsigned"]["transaction_id"] = txn_id
 
+    # If this is an invite for somebody else, then we don't care about the
+    # invite_room_state as that's meant solely for the invitee. Other clients
+    # will already have the state since they're in the room.
     if not is_invite:
         d["unsigned"].pop("invite_room_state", None)
 
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index b5bcfade70..f30eab76fd 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -250,7 +250,6 @@ class SyncRestServlet(RestServlet):
         """
         invited = {}
         for room in rooms:
-            logger.info("invite: %r", room.invite)
             invite = serialize_event(
                 room.invite, time_now, token_id=token_id,
                 event_format=format_event_for_client_v2_without_room_id,