diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2020-08-05 17:04:03 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2020-08-05 17:04:03 -0400 |
| commit | 460ebc558a2550a423ed859bdd0f74b22cba1859 (patch) | |
| tree | 3ab978e67490cd5bc175cee767015d16d79f4aea /contrib/cmdclient/console.py | |
| parent | maybe this will make lint happy? (diff) | |
| parent | Rename database classes to make some sense (#8033) (diff) | |
| download | synapse-460ebc558a2550a423ed859bdd0f74b22cba1859.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dehydration
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)) |