Fixup changelog and remove debug logging

3 files changed, 2 insertions, 5 deletions

diff --git a/changelog.d/5850.feature b/changelog.d/5850.feature
new file mode 100644

index 0000000000..b565929a54
--- /dev/null
+++ b/changelog.d/5850.feature
@@ -0,0 +1 @@
+Add retry to well-known lookups if we have recently seen a valid well-known record for the server.
diff --git a/changelog.d/5850.misc b/changelog.d/5850.misc
deleted file mode 100644

index c4f879ca2f..0000000000
--- a/changelog.d/5850.misc
+++ /dev/null
@@ -1 +0,0 @@
-Retry well-known lookups if we have recently seen a valid well-known record for the server.
diff --git a/synapse/http/federation/well_known_resolver.py b/synapse/http/federation/well_known_resolver.py

index d59864e298..c846003886 100644
--- a/synapse/http/federation/well_known_resolver.py
+++ b/synapse/http/federation/well_known_resolver.py
@@ -163,9 +163,7 @@ class WellKnownResolver(object):
             Deferred[Tuple[bytes,int]]: The lookup result and cache period.
         """
 
-        had_valid_well_known = bool(
-            self._had_valid_well_known_cache.get(server_name, False)
-        )
+        had_valid_well_known = self._had_valid_well_known_cache.get(server_name, False)
 
         # We do this in two steps to differentiate between possibly transient
         # errors (e.g. can't connect to host, 503 response) and more permenant
@@ -247,7 +245,6 @@ class WellKnownResolver(object):
                 # Bail if we've been cancelled
                 raise
             except Exception as e:
-                logger.info("Retry: %s", retry)
                 if not retry or i >= WELL_KNOWN_RETRY_ATTEMPTS:
                     logger.info("Error fetching %s: %s", uri_str, e)
                     raise _FetchWellKnownFailure(temporary=True)