mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 01:52:00 +00:00
Remove unused public room list timeout param (#6179)
* Remove unused public room list timeout param * Add changelog
This commit is contained in:
parent
b94a401852
commit
ea7d938bca
1
changelog.d/6179.misc
Normal file
1
changelog.d/6179.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Remove unused `timeout` parameter from `_get_public_room_list`.
|
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user