summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-05-07 14:46:47 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-05-07 14:46:47 +0100
commit0a1ebe5442ee84ed81b0b39cd2d7b9682dcb9f50 (patch)
tree78e8b184de94998ec1d631c9e706a2026122262c
parentReturn get_users_in_room cache size (diff)
downloadsynapse-0a1ebe5442ee84ed81b0b39cd2d7b9682dcb9f50.tar.xz
More logging, make get_users_who_share_room_with_user non-iterable
-rw-r--r--synapse/handlers/sync.py1
-rw-r--r--synapse/storage/data_stores/main/roommember.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 6a8a117841..c3bd366240 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1143,6 +1143,7 @@ class SyncHandler(object):
             # that were in a room we've left.
 
             logger.info("get_users_who_share_room... called from _generate_sync_entry")
+            logger.info("*Called with %s", user_id)
             users_who_share_room = await self.store.get_users_who_share_room_with_user(
                 user_id
             )
diff --git a/synapse/storage/data_stores/main/roommember.py b/synapse/storage/data_stores/main/roommember.py
index 2715540f7c..294d5410ad 100644
--- a/synapse/storage/data_stores/main/roommember.py
+++ b/synapse/storage/data_stores/main/roommember.py
@@ -486,7 +486,7 @@ class RoomMemberWorkerStore(EventsWorkerStore):
         )
         return frozenset(r.room_id for r in rooms)
 
-    @cachedInlineCallbacks(max_entries=500000, cache_context=True, iterable=True)
+    @cachedInlineCallbacks(max_entries=500000, cache_context=True)
     def get_users_who_share_room_with_user(self, user_id, cache_context):
         """Returns the set of users who share a room with `user_id`
         """