summary refs log tree commit diff
path: root/synapse/http/matrixfederationclient.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 10:25:06 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 10:25:06 +0000
commitdcf52469e821b3b2b69a0610c2c4f025a5aac68f (patch)
treeec7527eedb3de013c6ff2a34883e627df1890a09 /synapse/http/matrixfederationclient.py
parentTime out HTTP federation requests (diff)
downloadsynapse-dcf52469e821b3b2b69a0610c2c4f025a5aac68f.tar.xz
Move time_bound_deferred into Clock
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
-rw-r--r--synapse/http/matrixfederationclient.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index fdc1e2678e..74e523960f 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -22,7 +22,7 @@ from twisted.web._newclient import ResponseDone
 
 from synapse.http.agent_name import AGENT_NAME
 from synapse.http.endpoint import matrix_federation_endpoint
-from synapse.util.async import sleep, time_bound_deferred
+from synapse.util.async import sleep
 from synapse.util.logcontext import PreserveLoggingContext
 
 from syutil.jsonutil import encode_canonical_json
@@ -129,9 +129,8 @@ class MatrixFederationHttpClient(object):
                         producer
                     )
 
-                    response = yield time_bound_deferred(
+                    response = yield self.clock.time_bound_deferred(
                         request_deferred,
-                        clock=self.clock,
                         time_out=60,
                     )