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

Commit

Permalink
Fix exception when failing to get remote room list (#10414)
Browse files Browse the repository at this point in the history
  • Loading branch information
erikjohnston authored Jul 20, 2021
1 parent eebfd02 commit f3ac9c6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/10414.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a number of logged errors caused by remote servers being down.
6 changes: 5 additions & 1 deletion synapse/handlers/room_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,11 @@ async def get_remote_public_room_list(
):
logger.debug("Falling back to locally-filtered /publicRooms")
else:
raise # Not an error that should trigger a fallback.
# Not an error that should trigger a fallback.
raise SynapseError(502, "Failed to fetch room list")
except RequestSendFailed:
# Not an error that should trigger a fallback.
raise SynapseError(502, "Failed to fetch room list")

# if we reach this point, then we fall back to the situation where
# we currently don't support searching across federation, so we have
Expand Down

0 comments on commit f3ac9c6

Please sign in to comment.