Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-08-03 23:34:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Convert streams to async. (#8014)

Browse source
This commit is contained in:
Patrick Cloke 2020-08-04 07:21:47 -04:00 • committed by GitHub
parent 916cf2d439
commit e19de43eb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

22
synapse/streams/events.py
View file

@ -15,8 +15,6 @@
from typing import Any, Dict
from twisted.internet import defer
from synapse.handlers.account_data import AccountDataEventSource
from synapse.handlers.presence import PresenceEventSource
from synapse.handlers.receipts import ReceiptEventSource
@ -40,19 +38,18 @@ class EventSources(object):
} # type: Dict[str, Any]
self.store = hs.get_datastore()
@defer.inlineCallbacks
def get_current_token(self):
def get_current_token(self) -> StreamToken:
push_rules_key, _ = self.store.get_push_rules_stream_token()
to_device_key = self.store.get_to_device_stream_token()
device_list_key = self.store.get_device_stream_token()
groups_key = self.store.get_group_stream_token()
token = StreamToken(
room_key=(yield self.sources["room"].get_current_key()),
presence_key=(yield self.sources["presence"].get_current_key()),
typing_key=(yield self.sources["typing"].get_current_key()),
receipt_key=(yield self.sources["receipt"].get_current_key()),
account_data_key=(yield self.sources["account_data"].get_current_key()),
room_key=self.sources["room"].get_current_key(),
presence_key=self.sources["presence"].get_current_key(),
typing_key=self.sources["typing"].get_current_key(),
receipt_key=self.sources["receipt"].get_current_key(),
account_data_key=self.sources["account_data"].get_current_key(),
push_rules_key=push_rules_key,
to_device_key=to_device_key,
device_list_key=device_list_key,
@ -60,8 +57,7 @@ class EventSources(object):
)
return token
@defer.inlineCallbacks
def get_current_token_for_pagination(self):
def get_current_token_for_pagination(self) -> StreamToken:
"""Get the current token for a given room to be used to paginate
events.
@ -69,10 +65,10 @@ class EventSources(object):
than `room`, since they are not used during pagination.
Returns:
Deferred[StreamToken]
The current token for pagination.
"""
token = StreamToken(
room_key=(yield self.sources["room"].get_current_key()),
room_key=self.sources["room"].get_current_key(),
presence_key=0,
typing_key=0,
receipt_key=0,