diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 7c5e47bc81..305fd00fc0 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -19,8 +19,6 @@ from typing import TYPE_CHECKING, Dict, Union
from prometheus_client import Gauge
-from twisted.internet import defer
-
from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.push import PusherConfigException
from synapse.push.emailpusher import EmailPusher
@@ -52,7 +50,7 @@ class PusherPool:
Note that it is expected that each pusher will have its own 'processing' loop which
will send out the notifications in the background, rather than blocking until the
notifications are sent; accordingly Pusher.on_started, Pusher.on_new_notifications and
- Pusher.on_new_receipts are not expected to return deferreds.
+ Pusher.on_new_receipts are not expected to return awaitables.
"""
def __init__(self, hs: "HomeServer"):
@@ -79,8 +77,7 @@ class PusherPool:
return
run_as_background_process("start_pushers", self._start_pushers)
- @defer.inlineCallbacks
- def add_pusher(
+ async def add_pusher(
self,
user_id,
access_token,
@@ -96,7 +93,7 @@ class PusherPool:
"""Creates a new pusher and adds it to the pool
Returns:
- Deferred[EmailPusher|HttpPusher]
+ EmailPusher|HttpPusher
"""
time_now_msec = self.clock.time_msec()
@@ -126,9 +123,9 @@ class PusherPool:
# create the pusher setting last_stream_ordering to the current maximum
# stream ordering in event_push_actions, so it will process
# pushes from this point onwards.
- last_stream_ordering = yield self.store.get_latest_push_action_stream_ordering()
+ last_stream_ordering = await self.store.get_latest_push_action_stream_ordering()
- yield self.store.add_pusher(
+ await self.store.add_pusher(
user_id=user_id,
access_token=access_token,
kind=kind,
@@ -142,15 +139,14 @@ class PusherPool:
last_stream_ordering=last_stream_ordering,
profile_tag=profile_tag,
)
- pusher = yield self.start_pusher_by_id(app_id, pushkey, user_id)
+ pusher = await self.start_pusher_by_id(app_id, pushkey, user_id)
return pusher
- @defer.inlineCallbacks
- def remove_pushers_by_app_id_and_pushkey_not_user(
+ async def remove_pushers_by_app_id_and_pushkey_not_user(
self, app_id, pushkey, not_user_id
):
- to_remove = yield self.store.get_pushers_by_app_id_and_pushkey(app_id, pushkey)
+ to_remove = await self.store.get_pushers_by_app_id_and_pushkey(app_id, pushkey)
for p in to_remove:
if p["user_name"] != not_user_id:
logger.info(
@@ -159,10 +155,9 @@ class PusherPool:
pushkey,
p["user_name"],
)
- yield self.remove_pusher(p["app_id"], p["pushkey"], p["user_name"])
+ await self.remove_pusher(p["app_id"], p["pushkey"], p["user_name"])
- @defer.inlineCallbacks
- def remove_pushers_by_access_token(self, user_id, access_tokens):
+ async def remove_pushers_by_access_token(self, user_id, access_tokens):
"""Remove the pushers for a given user corresponding to a set of
access_tokens.
@@ -175,7 +170,7 @@ class PusherPool:
return
tokens = set(access_tokens)
- for p in (yield self.store.get_pushers_by_user_id(user_id)):
+ for p in await self.store.get_pushers_by_user_id(user_id):
if p["access_token"] in tokens:
logger.info(
"Removing pusher for app id %s, pushkey %s, user %s",
@@ -183,16 +178,15 @@ class PusherPool:
p["pushkey"],
p["user_name"],
)
- yield self.remove_pusher(p["app_id"], p["pushkey"], p["user_name"])
+ await self.remove_pusher(p["app_id"], p["pushkey"], p["user_name"])
- @defer.inlineCallbacks
- def on_new_notifications(self, min_stream_id, max_stream_id):
+ async def on_new_notifications(self, min_stream_id, max_stream_id):
if not self.pushers:
# nothing to do here.
return
try:
- users_affected = yield self.store.get_push_action_users_in_range(
+ users_affected = await self.store.get_push_action_users_in_range(
min_stream_id, max_stream_id
)
@@ -200,7 +194,7 @@ class PusherPool:
if u in self.pushers:
# Don't push if the user account has expired
if self._account_validity.enabled:
- expired = yield self.store.is_account_expired(
+ expired = await self.store.is_account_expired(
u, self.clock.time_msec()
)
if expired:
@@ -212,8 +206,7 @@ class PusherPool:
except Exception:
logger.exception("Exception in pusher on_new_notifications")
- @defer.inlineCallbacks
- def on_new_receipts(self, min_stream_id, max_stream_id, affected_room_ids):
+ async def on_new_receipts(self, min_stream_id, max_stream_id, affected_room_ids):
if not self.pushers:
# nothing to do here.
return
@@ -221,7 +214,7 @@ class PusherPool:
try:
# Need to subtract 1 from the minimum because the lower bound here
# is not inclusive
- users_affected = yield self.store.get_users_sent_receipts_between(
+ users_affected = await self.store.get_users_sent_receipts_between(
min_stream_id - 1, max_stream_id
)
@@ -241,12 +234,11 @@ class PusherPool:
except Exception:
logger.exception("Exception in pusher on_new_receipts")
- @defer.inlineCallbacks
- def start_pusher_by_id(self, app_id, pushkey, user_id):
+ async def start_pusher_by_id(self, app_id, pushkey, user_id):
"""Look up the details for the given pusher, and start it
Returns:
- Deferred[EmailPusher|HttpPusher|None]: The pusher started, if any
+ EmailPusher|HttpPusher|None: The pusher started, if any
"""
if not self._should_start_pushers:
return
@@ -254,7 +246,7 @@ class PusherPool:
if not self._pusher_shard_config.should_handle(self._instance_name, user_id):
return
- resultlist = yield self.store.get_pushers_by_app_id_and_pushkey(app_id, pushkey)
+ resultlist = await self.store.get_pushers_by_app_id_and_pushkey(app_id, pushkey)
pusher_dict = None
for r in resultlist:
@@ -263,34 +255,29 @@ class PusherPool:
pusher = None
if pusher_dict:
- pusher = yield self._start_pusher(pusher_dict)
+ pusher = await self._start_pusher(pusher_dict)
return pusher
- @defer.inlineCallbacks
- def _start_pushers(self):
+ async def _start_pushers(self) -> None:
"""Start all the pushers
-
- Returns:
- Deferred
"""
- pushers = yield self.store.get_all_pushers()
+ pushers = await self.store.get_all_pushers()
# Stagger starting up the pushers so we don't completely drown the
# process on start up.
- yield concurrently_execute(self._start_pusher, pushers, 10)
+ await concurrently_execute(self._start_pusher, pushers, 10)
logger.info("Started pushers")
- @defer.inlineCallbacks
- def _start_pusher(self, pusherdict):
+ async def _start_pusher(self, pusherdict):
"""Start the given pusher
Args:
pusherdict (dict): dict with the values pulled from the db table
Returns:
- Deferred[EmailPusher|HttpPusher]
+ EmailPusher|HttpPusher
"""
if not self._pusher_shard_config.should_handle(
self._instance_name, pusherdict["user_name"]
@@ -333,7 +320,7 @@ class PusherPool:
user_id = pusherdict["user_name"]
last_stream_ordering = pusherdict["last_stream_ordering"]
if last_stream_ordering:
- have_notifs = yield self.store.get_if_maybe_push_in_range_for_user(
+ have_notifs = await self.store.get_if_maybe_push_in_range_for_user(
user_id, last_stream_ordering
)
else:
@@ -345,8 +332,7 @@ class PusherPool:
return p
- @defer.inlineCallbacks
- def remove_pusher(self, app_id, pushkey, user_id):
+ async def remove_pusher(self, app_id, pushkey, user_id):
appid_pushkey = "%s:%s" % (app_id, pushkey)
byuser = self.pushers.get(user_id, {})
@@ -358,6 +344,6 @@ class PusherPool:
synapse_pushers.labels(type(pusher).__name__, pusher.app_id).dec()
- yield self.store.delete_pusher_by_app_id_pushkey_user_id(
+ await self.store.delete_pusher_by_app_id_pushkey_user_id(
app_id, pushkey, user_id
)
|
