Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-18 06:34:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused public room list timeout param (#6179)

Browse Source 
* Remove unused public room list timeout param

* Add changelog
This commit is contained in:
Andrew Morgan 2019-10-08 13:51:25 +01:00 committed by Amber Brown
parent b94a401852
commit ea7d938bca
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Remove unused `timeout` parameter from `_get_public_room_list`.

13
synapse/handlers/room_list.py
View File

@ -88,16 +88,8 @@ class RoomListHandler(BaseHandler):
# appservice specific lists. # appservice specific lists.
logger.info("Bypassing cache as search request.") logger.info("Bypassing cache as search request.")
# XXX: Quick hack to stop room directory queries taking too long.
# Timeout request after 60s. Probably want a more fundamental
# solution at some point
timeout = self.clock.time() + 60
return self._get_public_room_list( return self._get_public_room_list(
limit, limit, since_token, search_filter, network_tuple=network_tuple
since_token,
search_filter,
network_tuple=network_tuple,
timeout=timeout,
) )
key = (limit, since_token, network_tuple) key = (limit, since_token, network_tuple)
@ -118,7 +110,6 @@ class RoomListHandler(BaseHandler):
search_filter=None, search_filter=None,
network_tuple=EMPTY_THIRD_PARTY_ID, network_tuple=EMPTY_THIRD_PARTY_ID,
from_federation=False, from_federation=False,
timeout=None,
): ):
"""Generate a public room list. """Generate a public room list.
Args: Args:
@ -131,8 +122,6 @@ class RoomListHandler(BaseHandler):
Setting to None returns all public rooms across all lists. Setting to None returns all public rooms across all lists.
from_federation (bool): Whether this request originated from a from_federation (bool): Whether this request originated from a
federating server or a client. Used for room filtering. federating server or a client. Used for room filtering.
timeout (int|None): Amount of seconds to wait for a response before
timing out. TODO
""" """
# Pagination tokens work by storing the room ID sent in the last batch, # Pagination tokens work by storing the room ID sent in the last batch,