tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix exception when failing to get remote room list (#10414)

Browse source
This commit is contained in:
Erik Johnston 2021-07-20 11:35:23 +01:00 committed by GitHub
parent eebfd024e9
commit f3ac9c6750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/10414.bugfix Normal file
View file

@ -0,0 +1 @@
Fix a number of logged errors caused by remote servers being down.

6
synapse/handlers/room_list.py
View file

@ -383,7 +383,11 @@ class RoomListHandler(BaseHandler):
): ):
logger.debug("Falling back to locally-filtered /publicRooms") logger.debug("Falling back to locally-filtered /publicRooms")
else: 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 # if we reach this point, then we fall back to the situation where
# we currently don't support searching across federation, so we have # we currently don't support searching across federation, so we have