summary refs log tree commit diff
path: root/synapse/federation/transport
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-19 14:53:32 +0100
committerErik Johnston <erik@matrix.org>2015-05-19 14:53:32 +0100
commit5b1631a4a9ad4c1ed0adaff3ffc8238014359e95 (patch)
tree5aadd2fdcfc18e7565fb78c5e742c6b26b3796a3 /synapse/federation/transport
parentHandle the case when things return empty but non none things (diff)
downloadsynapse-5b1631a4a9ad4c1ed0adaff3ffc8238014359e95.tar.xz
Add a timeout param to get_event
Diffstat (limited to 'synapse/federation/transport')
-rw-r--r--synapse/federation/transport/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py

index 80d03012b7..c2b53b78b2 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py
@@ -50,7 +50,7 @@ class TransportLayerClient(object): ) @log_function - def get_event(self, destination, event_id): + def get_event(self, destination, event_id, timeout=None): """ Requests the pdu with give id and origin from the given server. Args: @@ -65,7 +65,7 @@ class TransportLayerClient(object): destination, event_id) path = PREFIX + "/event/%s/" % (event_id, ) - return self.client.get_json(destination, path=path) + return self.client.get_json(destination, path=path, timeout=timeout) @log_function def backfill(self, destination, room_id, event_tuples, limit):