summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-09-22 12:45:02 +0100
committerGitHub <noreply@github.com>2016-09-22 12:45:02 +0100
commit81964aeb901d1acf3cb353618ffda055b6a850ac (patch)
treef29c8dcf9ab85c10033799e27fbb03b3798e2eb4 /synapse/rest/client/v1/room.py
parentMerge pull request #1134 from matrix-org/erikj/fix_stream_public_deletion (diff)
parentSupport /initialSync in synchrotron worker (diff)
downloadsynapse-81964aeb901d1acf3cb353618ffda055b6a850ac.tar.xz
Merge pull request #1132 from matrix-org/erikj/initial_sync_split
Support /initialSync in synchrotron worker
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r--synapse/rest/client/v1/room.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py

index 45287bf05b..20889e4af0 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py
@@ -456,13 +456,13 @@ class RoomInitialSyncRestServlet(ClientV1RestServlet): def __init__(self, hs): super(RoomInitialSyncRestServlet, self).__init__(hs) - self.handlers = hs.get_handlers() + self.initial_sync_handler = hs.get_initial_sync_handler() @defer.inlineCallbacks def on_GET(self, request, room_id): requester = yield self.auth.get_user_by_req(request, allow_guest=True) pagination_config = PaginationConfig.from_request(request) - content = yield self.handlers.message_handler.room_initial_sync( + content = yield self.initial_sync_handler.room_initial_sync( room_id=room_id, requester=requester, pagin_config=pagination_config,