summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-31 18:43:20 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-31 18:43:20 +0000
commit625385d6841b5d2e62d83f073fd7f1af5a5aeda6 (patch)
treef1fe4bbd1f524985a9e61db6b15ff2c0b21b72a4 /synapse/handlers
parentReject large transactions on federation (#4513) (diff)
parentv0.99.0rc3 (diff)
downloadsynapse-625385d6841b5d2e62d83f073fd7f1af5a5aeda6.tar.xz
Merge branch 'release-v0.99.0' into develop
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sync.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 28857bfc1c..bd97241ab4 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -895,14 +895,17 @@ class SyncHandler(object):
         Returns:
             Deferred(SyncResult)
         """
-        logger.info("Calculating sync response for %r", sync_config.user)
-
         # NB: The now_token gets changed by some of the generate_sync_* methods,
         # this is due to some of the underlying streams not supporting the ability
         # to query up to a given point.
         # Always use the `now_token` in `SyncResultBuilder`
         now_token = yield self.event_sources.get_current_token()
 
+        logger.info(
+            "Calculating sync response for %r between %s and %s",
+            sync_config.user, since_token, now_token,
+        )
+
         user_id = sync_config.user.to_string()
         app_service = self.store.get_app_service_by_user_id(user_id)
         if app_service:
@@ -1390,6 +1393,12 @@ class SyncHandler(object):
         room_entries = []
         invited = []
         for room_id, events in iteritems(mem_change_events_by_room_id):
+            logger.info(
+                "Membership changes in %s: [%s]",
+                room_id,
+                ", ".join(("%s (%s)" % (e.event_id, e.membership) for e in events)),
+            )
+
             non_joins = [e for e in events if e.membership != Membership.JOIN]
             has_join = len(non_joins) != len(events)