diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-21 17:02:54 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-21 17:02:54 +0100 |
| commit | f6d1183fc5f5e687818e6d83394bbd571d24c633 (patch) | |
| tree | c6b74e6ee0925ba9b31ef2f1fdb0fb1de9dd20ac /synapse/handlers/room.py | |
| parent | Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse (diff) | |
| parent | Don't try to use a txn when not in one, remove spurious debug logging (diff) | |
| download | synapse-f6d1183fc5f5e687818e6d83394bbd571d24c633.tar.xz | |
Merge branch 'markjh/pusher_performance_master' of github.com:matrix-org/synapse into hotfixes-v0.9.0-r5
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index cfa2e38ed2..3da08c147e 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -531,9 +531,7 @@ class RoomListHandler(BaseHandler): chunk = yield self.store.get_rooms(is_public=True) results = yield defer.gatherResults( [ - self.store.get_users_in_room( - room_id=room["room_id"], - ) + self.store.get_users_in_room(room["room_id"]) for room in chunk ], consumeErrors=True, |