diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-22 09:37:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 09:37:10 +0100 |
| commit | 77ac14b960cb8daef76062ce85fc0427749b48af (patch) | |
| tree | 4a2b3af0e0404640a2ef251030cd3c2591a1d6ba /synapse/http/matrixfederationclient.py | |
| parent | Populate synapse_federation_client_sent_pdu_destinations:count again (#3386) (diff) | |
| download | synapse-77ac14b960cb8daef76062ce85fc0427749b48af.tar.xz | |
Pass around the reactor explicitly (#3385)
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 993dc06e02..4e0399e762 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -22,7 +22,7 @@ from twisted.web._newclient import ResponseDone from synapse.http import cancelled_to_request_timed_out_error from synapse.http.endpoint import matrix_federation_endpoint import synapse.metrics -from synapse.util.async import sleep, add_timeout_to_deferred +from synapse.util.async import add_timeout_to_deferred from synapse.util import logcontext from synapse.util.logcontext import make_deferred_yieldable import synapse.util.retryutils @@ -193,6 +193,7 @@ class MatrixFederationHttpClient(object): add_timeout_to_deferred( request_deferred, timeout / 1000. if timeout else 60, + self.hs.get_reactor(), cancelled_to_request_timed_out_error, ) response = yield make_deferred_yieldable( @@ -234,7 +235,7 @@ class MatrixFederationHttpClient(object): delay = min(delay, 2) delay *= random.uniform(0.8, 1.4) - yield sleep(delay) + yield self.clock.sleep(delay) retries_left -= 1 else: raise |