A pair of tiny cleanups in the federation request code. (#8401)

This commit is contained in:
Richard van der Hoff 2020-09-28 13:15:00 +01:00 committed by GitHub
parent 4b3a1faa08
commit 450ec48445
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions

1
changelog.d/8401.misc Normal file
View file

@ -0,0 +1 @@
A pair of tiny cleanups in the federation request code.

View file

@ -281,7 +281,7 @@ class FederationHandler(BaseHandler):
raise Exception( raise Exception(
"Error fetching missing prev_events for %s: %s" "Error fetching missing prev_events for %s: %s"
% (event_id, e) % (event_id, e)
) ) from e
# Update the set of things we've seen after trying to # Update the set of things we've seen after trying to
# fetch the missing stuff # fetch the missing stuff

View file

@ -473,8 +473,6 @@ class MatrixFederationHttpClient:
) )
response = await request_deferred response = await request_deferred
except TimeoutError as e:
raise RequestSendFailed(e, can_retry=True) from e
except DNSLookupError as e: except DNSLookupError as e:
raise RequestSendFailed(e, can_retry=retry_on_dns_fail) from e raise RequestSendFailed(e, can_retry=retry_on_dns_fail) from e
except Exception as e: except Exception as e: