diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-07-30 19:00:29 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-07-30 19:00:29 +0100 |
| commit | 69158e554f30ac8b6b646a62fa496a2c0005dea6 (patch) | |
| tree | 42fdb177abede9c0128906d4e6661cde0ee9cd6c /contrib/cmdclient/console.py | |
| parent | Changelog (diff) | |
| parent | Update workers docs (#7990) (diff) | |
| download | synapse-69158e554f30ac8b6b646a62fa496a2c0005dea6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_push_rules
Diffstat (limited to 'contrib/cmdclient/console.py')
| -rwxr-xr-x | contrib/cmdclient/console.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py index 77422f5e5d..dfc1d294dc 100755 --- a/contrib/cmdclient/console.py +++ b/contrib/cmdclient/console.py @@ -609,13 +609,15 @@ class SynapseCmd(cmd.Cmd): @defer.inlineCallbacks def _do_event_stream(self, timeout): - res = yield self.http_client.get_json( - self._url() + "/events", - { - "access_token": self._tok(), - "timeout": str(timeout), - "from": self.event_stream_token, - }, + res = yield defer.ensureDeferred( + self.http_client.get_json( + self._url() + "/events", + { + "access_token": self._tok(), + "timeout": str(timeout), + "from": self.event_stream_token, + }, + ) ) print(json.dumps(res, indent=4)) |