Skip to content
Snippets Groups Projects
Unverified Commit 7809f0c0 authored by reivilibre's avatar reivilibre Committed by GitHub
Browse files

Merge pull request #5851 from matrix-org/rei/roomdir_maybedeferred

Room Directory:  Wrap `get_local_public_room_list` call in `maybeDeferred`
parents f70d0a1d d6de55bc
No related branches found
No related tags found
No related merge requests found
Fix 500 Internal Server Error on `publicRooms` when the public room list was
cached.
......@@ -19,6 +19,8 @@ import functools
import logging
import re
from twisted.internet.defer import maybeDeferred
import synapse
import synapse.logging.opentracing as opentracing
from synapse.api.errors import Codes, FederationDeniedError, SynapseError
......@@ -745,8 +747,12 @@ class PublicRoomList(BaseFederationServlet):
else:
network_tuple = ThirdPartyInstanceID(None, None)
data = await self.handler.get_local_public_room_list(
limit, since_token, network_tuple=network_tuple, from_federation=True
data = await maybeDeferred(
self.handler.get_local_public_room_list,
limit,
since_token,
network_tuple=network_tuple,
from_federation=True,
)
return 200, data
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment