mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 09:21:53 +00:00
Use wait_for_events to implement 'get_events'
This commit is contained in:
parent
d244fa9741
commit
5e3b254dc8
@ -305,14 +305,16 @@ class Notifier(object):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def wait_for_events(self, user, rooms, filter, timeout, callback):
|
def wait_for_events(self, user, rooms, timeout, callback,
|
||||||
|
from_token=StreamToken("s0", "0", "0")):
|
||||||
"""Wait until the callback returns a non empty response or the
|
"""Wait until the callback returns a non empty response or the
|
||||||
timeout fires.
|
timeout fires.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
deferred = defer.Deferred()
|
deferred = defer.Deferred()
|
||||||
|
appservice = yield self.hs.get_datastore().get_app_service_by_user_id(
|
||||||
from_token = StreamToken("s0", "0", "0")
|
user.to_string()
|
||||||
|
)
|
||||||
|
|
||||||
listener = [_NotificationListener(
|
listener = [_NotificationListener(
|
||||||
user=user,
|
user=user,
|
||||||
@ -321,6 +323,7 @@ class Notifier(object):
|
|||||||
limit=1,
|
limit=1,
|
||||||
timeout=timeout,
|
timeout=timeout,
|
||||||
deferred=deferred,
|
deferred=deferred,
|
||||||
|
appservice=appservice,
|
||||||
)]
|
)]
|
||||||
|
|
||||||
if timeout:
|
if timeout:
|
||||||
@ -363,65 +366,43 @@ class Notifier(object):
|
|||||||
|
|
||||||
defer.returnValue(result)
|
defer.returnValue(result)
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
def get_events_for(self, user, rooms, pagination_config, timeout):
|
def get_events_for(self, user, rooms, pagination_config, timeout):
|
||||||
""" For the given user and rooms, return any new events for them. If
|
""" For the given user and rooms, return any new events for them. If
|
||||||
there are no new events wait for up to `timeout` milliseconds for any
|
there are no new events wait for up to `timeout` milliseconds for any
|
||||||
new events to happen before returning.
|
new events to happen before returning.
|
||||||
"""
|
"""
|
||||||
deferred = defer.Deferred()
|
from_token = pagination_config.from_token
|
||||||
|
|
||||||
self._get_events(
|
|
||||||
deferred, user, rooms, pagination_config.from_token,
|
|
||||||
pagination_config.limit, timeout
|
|
||||||
).addErrback(deferred.errback)
|
|
||||||
|
|
||||||
return deferred
|
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
|
||||||
def _get_events(self, deferred, user, rooms, from_token, limit, timeout):
|
|
||||||
if not from_token:
|
if not from_token:
|
||||||
from_token = yield self.event_sources.get_current_token()
|
from_token = yield self.event_sources.get_current_token()
|
||||||
|
|
||||||
appservice = yield self.hs.get_datastore().get_app_service_by_user_id(
|
limit = pagination_config.limit
|
||||||
user.to_string()
|
|
||||||
)
|
|
||||||
|
|
||||||
listener = _NotificationListener(
|
@defer.inlineCallbacks
|
||||||
user,
|
def check_for_updates():
|
||||||
rooms,
|
events = []
|
||||||
from_token,
|
end_token = from_token
|
||||||
limit,
|
for name, source in self.event_sources.sources.items():
|
||||||
timeout,
|
keyname = "%s_key" % name
|
||||||
deferred,
|
stuff, new_key = yield source.get_new_events_for_user(
|
||||||
appservice=appservice
|
user, getattr(from_token, keyname), limit,
|
||||||
)
|
|
||||||
|
|
||||||
def _timeout_listener():
|
|
||||||
# TODO (erikj): We should probably set to_token to the current
|
|
||||||
# max rather than reusing from_token.
|
|
||||||
# Remove the timer from the listener so we don't try to cancel it.
|
|
||||||
listener.timer = None
|
|
||||||
listener.notify(
|
|
||||||
self,
|
|
||||||
[],
|
|
||||||
listener.from_token,
|
|
||||||
listener.from_token,
|
|
||||||
)
|
|
||||||
|
|
||||||
if timeout:
|
|
||||||
self._register_with_keys(listener)
|
|
||||||
|
|
||||||
yield self._check_for_updates(listener)
|
|
||||||
|
|
||||||
if not timeout:
|
|
||||||
_timeout_listener()
|
|
||||||
else:
|
|
||||||
# Only add the timer if the listener hasn't been notified
|
|
||||||
if not listener.notified():
|
|
||||||
listener.timer = self.clock.call_later(
|
|
||||||
timeout/1000.0, _timeout_listener
|
|
||||||
)
|
)
|
||||||
return
|
events.extend(stuff)
|
||||||
|
end_token = from_token.copy_and_replace(keyname, new_key)
|
||||||
|
|
||||||
|
if events:
|
||||||
|
defer.returnValue((events, (from_token, end_token)))
|
||||||
|
else:
|
||||||
|
defer.returnValue(None)
|
||||||
|
|
||||||
|
result = yield self.wait_for_events(
|
||||||
|
user, rooms, timeout, check_for_updates, from_token=from_token
|
||||||
|
)
|
||||||
|
|
||||||
|
if result is None:
|
||||||
|
result = ([], (from_token, from_token))
|
||||||
|
|
||||||
|
defer.returnValue(result)
|
||||||
|
|
||||||
@log_function
|
@log_function
|
||||||
def _register_with_keys(self, listener):
|
def _register_with_keys(self, listener):
|
||||||
@ -436,36 +417,6 @@ class Notifier(object):
|
|||||||
listener.appservice, set()
|
listener.appservice, set()
|
||||||
).add(listener)
|
).add(listener)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
|
||||||
@log_function
|
|
||||||
def _check_for_updates(self, listener):
|
|
||||||
# TODO (erikj): We need to think about limits across multiple sources
|
|
||||||
events = []
|
|
||||||
|
|
||||||
from_token = listener.from_token
|
|
||||||
limit = listener.limit
|
|
||||||
|
|
||||||
# TODO (erikj): DeferredList?
|
|
||||||
for name, source in self.event_sources.sources.items():
|
|
||||||
keyname = "%s_key" % name
|
|
||||||
|
|
||||||
stuff, new_key = yield source.get_new_events_for_user(
|
|
||||||
listener.user,
|
|
||||||
getattr(from_token, keyname),
|
|
||||||
limit,
|
|
||||||
)
|
|
||||||
|
|
||||||
events.extend(stuff)
|
|
||||||
|
|
||||||
from_token = from_token.copy_and_replace(keyname, new_key)
|
|
||||||
|
|
||||||
end_token = from_token
|
|
||||||
|
|
||||||
if events:
|
|
||||||
listener.notify(self, events, listener.from_token, end_token)
|
|
||||||
|
|
||||||
defer.returnValue(listener)
|
|
||||||
|
|
||||||
def _user_joined_room(self, user, room_id):
|
def _user_joined_room(self, user, room_id):
|
||||||
new_listeners = self.user_to_listeners.get(user, set())
|
new_listeners = self.user_to_listeners.get(user, set())
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user