diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
| commit | 7f0d8e42885078583d1eab16df2523292ed1148d (patch) | |
| tree | 97d56ee3dd35549820a69b702d574d1704560773 /synapse/http/federation | |
| parent | Assume key existence. Update docstrings (diff) | |
| parent | remove dead transaction persist code (#5622) (diff) | |
| download | synapse-7f0d8e42885078583d1eab16df2523292ed1148d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfiltrate_data
Diffstat (limited to 'synapse/http/federation')
| -rw-r--r-- | synapse/http/federation/matrix_federation_agent.py | 2 | ||||
| -rw-r--r-- | synapse/http/federation/srv_resolver.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/federation/matrix_federation_agent.py b/synapse/http/federation/matrix_federation_agent.py index 414cde0777..054c321a20 100644 --- a/synapse/http/federation/matrix_federation_agent.py +++ b/synapse/http/federation/matrix_federation_agent.py @@ -30,9 +30,9 @@ from twisted.web.http_headers import Headers from twisted.web.iweb import IAgent from synapse.http.federation.srv_resolver import SrvResolver, pick_server_from_list +from synapse.logging.context import make_deferred_yieldable from synapse.util import Clock from synapse.util.caches.ttlcache import TTLCache -from synapse.util.logcontext import make_deferred_yieldable from synapse.util.metrics import Measure # period to cache .well-known results for by default diff --git a/synapse/http/federation/srv_resolver.py b/synapse/http/federation/srv_resolver.py index 1f22f78a75..ecc88f9b96 100644 --- a/synapse/http/federation/srv_resolver.py +++ b/synapse/http/federation/srv_resolver.py @@ -25,7 +25,7 @@ from twisted.internet.error import ConnectError from twisted.names import client, dns from twisted.names.error import DNSNameError, DomainError -from synapse.util.logcontext import make_deferred_yieldable +from synapse.logging.context import make_deferred_yieldable logger = logging.getLogger(__name__) |