Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:46:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move time_bound_deferred into Clock

Browse source
This commit is contained in:
Erik Johnston 2015-02-11 10:25:06 +00:00
parent 0e6b3e4e40
commit dcf52469e8
3 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/http/matrixfederationclient.py
View file

@ -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,
)