Skip to content

Commit

Permalink
Fix exceptions when fetching events from a down host. (matrix-org#7622)
Browse files Browse the repository at this point in the history
We already caught some exceptions, but not all.
  • Loading branch information
erikjohnston authored and phil-flex committed Jun 16, 2020
1 parent 6995165 commit 1d4abbf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/7622.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix exceptions when fetching events from a remote host fails.
2 changes: 1 addition & 1 deletion synapse/handlers/federation.py
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ async def _get_missing_events_for_pdu(self, origin, pdu, prevs, min_depth):
min_depth=min_depth,
timeout=60000,
)
except RequestSendFailed as e:
except (RequestSendFailed, HttpResponseException, NotRetryingDestination) as e:
# We failed to get the missing events, but since we need to handle
# the case of `get_missing_events` not returning the necessary
# events anyway, it is safe to simply log the error and continue.
Expand Down

0 comments on commit 1d4abbf

Please sign in to comment.