diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-27 16:11:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-27 16:11:43 +0100 |
| commit | 89c044c2a0727c73cce4e6bff9a25a87da6f52bd (patch) | |
| tree | 22d342f5beae7218c4f3664db8a888ddbafc4dab /synapse/rest/events.py | |
| parent | api docs: Finished adding all C-S APIs. Added initialSync, publicRooms, membe... (diff) | |
| parent | Turn off presence again. (diff) | |
| download | synapse-89c044c2a0727c73cce4e6bff9a25a87da6f52bd.tar.xz | |
Merge branch 'stream_refactor' into develop
Diffstat (limited to 'synapse/rest/events.py')
| -rw-r--r-- | synapse/rest/events.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/events.py b/synapse/rest/events.py index d89dfc193c..2e7563d14b 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,6 +41,7 @@ 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): |