Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup changelog and remove debug logging

This commit is contained in:
Erik Johnston 2019-08-16 13:15:26 +01:00
parent 1771f0045d
commit 861d663c15
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5850.feature Normal file
View File

@ -0,0 +1 @@
Add retry to well-known lookups if we have recently seen a valid well-known record for the server.

1
changelog.d/5850.misc
View File

@ -1 +0,0 @@
Retry well-known lookups if we have recently seen a valid well-known record for the server.

5
synapse/http/federation/well_known_resolver.py
View File

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