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

Backport deferred.addTimeout

Browse source 
Twisted 16.0 doesn't have addTimeout, so let's backport it.
This commit is contained in:
Richard van der Hoff 2018-04-27 12:52:30 +01:00
parent 1ea904b9f0
commit 9d2c1b8429
5 changed files with 90 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/http/client.py
View file

@ -20,6 +20,7 @@ from synapse.api.errors import (
CodeMessageException, MatrixCodeMessageException, SynapseError, Codes,
)
from synapse.http import cancelled_to_request_timed_out_error
from synapse.util.async import add_timeout_to_deferred
from synapse.util.caches import CACHE_SIZE_FACTOR
from synapse.util.logcontext import make_deferred_yieldable
import synapse.metrics
@ -102,8 +103,9 @@ class SimpleHttpClient(object):
request_deferred = self.agent.request(
method, uri, *args, **kwargs
)
request_deferred.addTimeout(
60, reactor, cancelled_to_request_timed_out_error,
add_timeout_to_deferred(
request_deferred,
60, cancelled_to_request_timed_out_error,
)
response = yield make_deferred_yieldable(request_deferred)