Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make minor clarifications to the error messages given when we fail to join a room via any server. (#13160)

This commit is contained in:
reivilibre 2022-07-27 10:37:50 +00:00 committed by GitHub
parent 4f3082d6bf
commit 39be5bc550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13160.misc Normal file
View File

@ -0,0 +1 @@
Make minor clarifications to the error messages given when we fail to join a room via any server.

8
synapse/federation/federation_client.py
View File

@ -725,6 +725,12 @@ class FederationClient(FederationBase):
if failover_errcodes is None: if failover_errcodes is None:
failover_errcodes = () failover_errcodes = ()
if not destinations:
# Give a bit of a clearer message if no servers were specified at all.
raise SynapseError(
502, f"Failed to {description} via any server: No servers specified."
)
for destination in destinations: for destination in destinations:
if destination == self.server_name: if destination == self.server_name:
continue continue
@ -774,7 +780,7 @@ class FederationClient(FederationBase):
"Failed to %s via %s", description, destination, exc_info=True "Failed to %s via %s", description, destination, exc_info=True
) )
raise SynapseError(502, "Failed to %s via any server" % (description,)) raise SynapseError(502, f"Failed to {description} via any server")
async def make_membership_event( async def make_membership_event(
self, self,

6
synapse/handlers/room_member.py
View File

@ -1679,7 +1679,11 @@ class RoomMemberMasterHandler(RoomMemberHandler):
] ]
if len(remote_room_hosts) == 0: if len(remote_room_hosts) == 0:
raise SynapseError(404, "No known servers") raise SynapseError(
404,
"Can't join remote room because no servers "
"that are in the room have been provided.",
)
check_complexity = self.hs.config.server.limit_remote_rooms.enabled check_complexity = self.hs.config.server.limit_remote_rooms.enabled
if ( if (

5
tests/rest/admin/test_room.py
View File

@ -1873,7 +1873,10 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
) )
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body) self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body)
self.assertEqual("No known servers", channel.json_body["error"]) self.assertEqual(
"Can't join remote room because no servers that are in the room have been provided.",
channel.json_body["error"],
)
def test_room_is_not_valid(self) -> None: def test_room_is_not_valid(self) -> None:
""" """