diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 18:57:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 18:57:46 +0100 |
| commit | 3a2a5b959cb1f56b26af32e1ad4c1db424279eb7 (patch) | |
| tree | 5f5b515cdaa586f1f7f92337471dfdc2e0d4683d /synapse/rest | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff) | |
| download | synapse-3a2a5b959cb1f56b26af32e1ad4c1db424279eb7.tar.xz | |
WIP: Completely change how event streaming and pagination work. This reflects the change in the underlying storage model.
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/events.py | 4 | ||||
| -rw-r--r-- | synapse/rest/initial_sync.py | 2 | ||||
| -rw-r--r-- | synapse/rest/room.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/synapse/rest/events.py b/synapse/rest/events.py index ca2f6978e5..28da418498 100644 --- a/synapse/rest/events.py +++ b/synapse/rest/events.py @@ -17,7 +17,7 @@ from twisted.internet import defer from synapse.api.errors import SynapseError -from synapse.api.streams import PaginationConfig +from synapse.streams.config import PaginationConfig from synapse.rest.base import RestServlet, client_path_pattern @@ -41,11 +41,13 @@ class EventStreamRestServlet(RestServlet): chunk = yield handler.get_stream(auth_user.to_string(), pagin_config, timeout=timeout) + defer.returnValue((200, chunk)) def on_OPTIONS(self, request): return (200, {}) + def register_servlets(hs, http_server): EventStreamRestServlet(hs).register(http_server) diff --git a/synapse/rest/initial_sync.py b/synapse/rest/initial_sync.py index fab748f562..e5059ff78c 100644 --- a/synapse/rest/initial_sync.py +++ b/synapse/rest/initial_sync.py @@ -15,7 +15,7 @@ from twisted.internet import defer -from synapse.api.streams import PaginationConfig +from synapse.streams.config import PaginationConfig from base import RestServlet, client_path_pattern diff --git a/synapse/rest/room.py b/synapse/rest/room.py index b031ad1bc4..ab05a7438d 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -22,7 +22,7 @@ from synapse.api.events.room import ( MessageEvent, RoomMemberEvent, FeedbackEvent ) from synapse.api.constants import Feedback -from synapse.api.streams import PaginationConfig +from synapse.streams.config import PaginationConfig import json import logging |