diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
| commit | 7f058c5ff743e2cf563b9aa5436ee9801a14e633 (patch) | |
| tree | 8ef0270ede93c304b0859c4e8fba49b9581b2514 /synapse/rest/events.py | |
| parent | Add twisted Service interface (diff) | |
| parent | Move experiments, graph and cmdclient into contrib (diff) | |
| download | synapse-7f058c5ff743e2cf563b9aa5436ee9801a14e633.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'synapse/rest/events.py')
| -rw-r--r-- | synapse/rest/events.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/events.py b/synapse/rest/events.py index cf6d13f817..bedcb2bcc6 100644 --- a/synapse/rest/events.py +++ b/synapse/rest/events.py @@ -44,8 +44,11 @@ class EventStreamRestServlet(RestServlet): except ValueError: raise SynapseError(400, "timeout must be in milliseconds.") + as_client_event = "raw" not in request.args + chunk = yield handler.get_stream( - auth_user.to_string(), pagin_config, timeout=timeout + auth_user.to_string(), pagin_config, timeout=timeout, + as_client_event=as_client_event ) except: logger.exception("Event stream failed") |