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

Commit f3ac9c6

Browse files
authored
Fix exception when failing to get remote room list (#10414)
1 parent eebfd02 commit f3ac9c6

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

changelog.d/10414.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a number of logged errors caused by remote servers being down.

synapse/handlers/room_list.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,11 @@ async def get_remote_public_room_list(
383383
):
384384
logger.debug("Falling back to locally-filtered /publicRooms")
385385
else:
386-
raise # Not an error that should trigger a fallback.
386+
# Not an error that should trigger a fallback.
387+
raise SynapseError(502, "Failed to fetch room list")
388+
except RequestSendFailed:
389+
# Not an error that should trigger a fallback.
390+
raise SynapseError(502, "Failed to fetch room list")
387391

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

0 commit comments

Comments
 (0)