mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-15 17:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix logcontexts

Browse source
This commit is contained in:
Erik Johnston 2019-08-23 15:05:56 +01:00
parent 1e4b4d85e7
commit e70f0081da
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
synapse/http/federation/matrix_federation_agent.py
View file

@ -28,7 +28,7 @@ from twisted.web.iweb import IAgent, IAgentEndpointFactory
from synapse.http.federation.srv_resolver import Server, SrvResolver
from synapse.http.federation.well_known_resolver import WellKnownResolver
from synapse.logging.context import PreserveLoggingContext, make_deferred_yieldable
from synapse.logging.context import make_deferred_yieldable, run_in_background
from synapse.util import Clock
logger = logging.getLogger(__name__)
@ -158,8 +158,9 @@ class MatrixFederationAgent(object):
if not headers.hasHeader(b"host"):
headers.addRawHeader(b"host", parsed_uri.netloc)
with PreserveLoggingContext():
res = yield self._agent.request(method, uri, headers, bodyProducer)
res = yield make_deferred_yieldable(
self._agent.request(method, uri, headers, bodyProducer)
)
return res
@ -214,11 +215,14 @@ class MatrixHostnameEndpoint(object):
self._srv_resolver = srv_resolver
@defer.inlineCallbacks
def connect(self, protocol_factory):
"""Implements IStreamClientEndpoint interface
"""
return run_in_background(self._do_connect, protocol_factory)
@defer.inlineCallbacks
def _do_connect(self, protocol_factory):
first_exception = None
server_list = yield self._resolve_server()