mirror of
https://github.com/element-hq/synapse
synced 2024-09-01 12:10:21 +00:00
Use self.clock instead of datetime
This commit is contained in:
parent
a2d85144e5
commit
5b1dc94083
1 changed files with 3 additions and 4 deletions
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
from datetime import datetime, timedelta
|
|
||||||
|
|
||||||
from six import PY3, iteritems
|
from six import PY3, iteritems
|
||||||
from six.moves import range
|
from six.moves import range
|
||||||
|
@ -78,7 +77,7 @@ class RoomListHandler(BaseHandler):
|
||||||
# XXX: Quick hack to stop room directory queries taking too long.
|
# XXX: Quick hack to stop room directory queries taking too long.
|
||||||
# Timeout request after 60s. Probably want a more fundamental
|
# Timeout request after 60s. Probably want a more fundamental
|
||||||
# solution at some point
|
# solution at some point
|
||||||
timeout = datetime.now() + timedelta(seconds=60)
|
timeout = self.clock.time() + 60
|
||||||
return self._get_public_room_list(
|
return self._get_public_room_list(
|
||||||
limit, since_token, search_filter,
|
limit, since_token, search_filter,
|
||||||
network_tuple=network_tuple, timeout=timeout,
|
network_tuple=network_tuple, timeout=timeout,
|
||||||
|
@ -95,7 +94,7 @@ class RoomListHandler(BaseHandler):
|
||||||
def _get_public_room_list(self, limit=None, since_token=None,
|
def _get_public_room_list(self, limit=None, since_token=None,
|
||||||
search_filter=None,
|
search_filter=None,
|
||||||
network_tuple=EMPTY_THIRD_PARTY_ID,
|
network_tuple=EMPTY_THIRD_PARTY_ID,
|
||||||
timeout=None,):
|
timeout=0,):
|
||||||
if since_token and since_token != "END":
|
if since_token and since_token != "END":
|
||||||
since_token = RoomListNextBatch.from_token(since_token)
|
since_token = RoomListNextBatch.from_token(since_token)
|
||||||
else:
|
else:
|
||||||
|
@ -210,7 +209,7 @@ class RoomListHandler(BaseHandler):
|
||||||
|
|
||||||
chunk = []
|
chunk = []
|
||||||
for i in range(0, len(rooms_to_scan), step):
|
for i in range(0, len(rooms_to_scan), step):
|
||||||
if timeout and datetime.now() > timeout:
|
if timeout and self.clock.time() > timeout:
|
||||||
raise Exception("Timed out searching room directory")
|
raise Exception("Timed out searching room directory")
|
||||||
|
|
||||||
batch = rooms_to_scan[i:i + step]
|
batch = rooms_to_scan[i:i + step]
|
||||||
|
|
Loading…
Reference in a new issue