Merge pull request #813 from matrix-org/dbkr/fix_room_list_spidering

Fix room list spidering
This commit is contained in:
Erik Johnston 2016-06-01 18:02:27 +01:00
commit 83b70c9f63

View File

@ -441,7 +441,7 @@ class RoomListHandler(BaseHandler):
self.hs.config.secondary_directory_servers self.hs.config.secondary_directory_servers
) )
self.remote_list_request_cache.set((), deferred) self.remote_list_request_cache.set((), deferred)
yield deferred self.remote_list_cache = yield deferred
@defer.inlineCallbacks @defer.inlineCallbacks
def get_aggregated_public_room_list(self): def get_aggregated_public_room_list(self):