diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-30 16:37:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-30 16:37:22 +0000 |
| commit | 828db669ecf4a631a4cab0c78d2ea8df7c531716 (patch) | |
| tree | 01631edbe830b72ede07a29afebd2f4608260fa5 /synapse | |
| parent | Merge pull request #1857 from matrix-org/erikj/device_list_stream (diff) | |
| download | synapse-828db669ecf4a631a4cab0c78d2ea8df7c531716.tar.xz | |
Use get_users_in_room and declare it iterable
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/device.py | 2 | ||||
| -rw-r--r-- | synapse/storage/roommember.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index 6fefb85890..7245d14fab 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -203,7 +203,7 @@ class DeviceHandler(BaseHandler): hosts = set() if self.hs.is_mine_id(user_id): for room_id in room_ids: - users = yield self.state.get_current_user_in_room(room_id) + users = yield self.store.get_users_in_room(room_id) hosts.update(get_domain_from_id(u) for u in users) hosts.discard(self.server_name) diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 768e0a4451..6cf1a538ae 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -131,7 +131,7 @@ class RoomMemberStore(SQLBaseStore): with self._stream_id_gen.get_next() as stream_ordering: yield self.runInteraction("locally_reject_invite", f, stream_ordering) - @cached(max_entries=5000) + @cached(max_entries=1000000, iterable=True) def get_users_in_room(self, room_id): def f(txn): |