Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Fix exceptions when fetching events from a down host. #7622

Merged
merged 2 commits into from
Jun 3, 2020
Merged

Fix exceptions when fetching events from a down host. #7622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a6cc21
Fix exceptions when fetching events from a down host.
erikjohnston Jun 3, 2020
eec9b6c
Newsfile
erikjohnston Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7622.bugfix
View file
Open in desktop
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
View file
Open in desktop
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