diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index 3aeb46980d..9acbc9e34d 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -17,7 +17,6 @@ import logging
from prometheus_client import Counter
-from twisted.internet import defer
from twisted.internet.error import AlreadyCalled, AlreadyCancelled
from synapse.api.constants import EventTypes
@@ -132,12 +131,11 @@ class HttpPusher(object):
# but currently that's the only type of receipt anyway...
run_as_background_process("http_pusher.on_new_receipts", self._update_badge)
- @defer.inlineCallbacks
- def _update_badge(self):
+ async def _update_badge(self):
# XXX as per https://github.com/matrix-org/matrix-doc/issues/2627, this seems
# to be largely redundant. perhaps we can remove it.
- badge = yield push_tools.get_badge_count(self.hs.get_datastore(), self.user_id)
- yield self._send_badge(badge)
+ badge = await push_tools.get_badge_count(self.hs.get_datastore(), self.user_id)
+ await self._send_badge(badge)
def on_timer(self):
self._start_processing()
@@ -156,8 +154,7 @@ class HttpPusher(object):
run_as_background_process("httppush.process", self._process)
- @defer.inlineCallbacks
- def _process(self):
+ async def _process(self):
# we should never get here if we are already processing
assert not self._is_processing
@@ -168,7 +165,7 @@ class HttpPusher(object):
while True:
starting_max_ordering = self.max_stream_ordering
try:
- yield self._unsafe_process()
+ await self._unsafe_process()
except Exception:
logger.exception("Exception processing notifs")
if self.max_stream_ordering == starting_max_ordering:
@@ -176,8 +173,7 @@ class HttpPusher(object):
finally:
self._is_processing = False
- @defer.inlineCallbacks
- def _unsafe_process(self):
+ async def _unsafe_process(self):
"""
Looks for unset notifications and dispatch them, in order
Never call this directly: use _process which will only allow this to
@@ -185,7 +181,7 @@ class HttpPusher(object):
"""
fn = self.store.get_unread_push_actions_for_user_in_range_for_http
- unprocessed = yield fn(
+ unprocessed = await fn(
self.user_id, self.last_stream_ordering, self.max_stream_ordering
)
@@ -207,13 +203,13 @@ class HttpPusher(object):
"app_display_name": self.app_display_name,
},
):
- processed = yield self._process_one(push_action)
+ processed = await self._process_one(push_action)
if processed:
http_push_processed_counter.inc()
self.backoff_delay = HttpPusher.INITIAL_BACKOFF_SEC
self.last_stream_ordering = push_action["stream_ordering"]
- pusher_still_exists = yield self.store.update_pusher_last_stream_ordering_and_success(
+ pusher_still_exists = await self.store.update_pusher_last_stream_ordering_and_success(
self.app_id,
self.pushkey,
self.user_id,
@@ -228,14 +224,14 @@ class HttpPusher(object):
if self.failing_since:
self.failing_since = None
- yield self.store.update_pusher_failing_since(
+ await self.store.update_pusher_failing_since(
self.app_id, self.pushkey, self.user_id, self.failing_since
)
else:
http_push_failed_counter.inc()
if not self.failing_since:
self.failing_since = self.clock.time_msec()
- yield self.store.update_pusher_failing_since(
+ await self.store.update_pusher_failing_since(
self.app_id, self.pushkey, self.user_id, self.failing_since
)
@@ -254,7 +250,7 @@ class HttpPusher(object):
)
self.backoff_delay = HttpPusher.INITIAL_BACKOFF_SEC
self.last_stream_ordering = push_action["stream_ordering"]
- pusher_still_exists = yield self.store.update_pusher_last_stream_ordering(
+ pusher_still_exists = await self.store.update_pusher_last_stream_ordering(
self.app_id,
self.pushkey,
self.user_id,
@@ -267,7 +263,7 @@ class HttpPusher(object):
return
self.failing_since = None
- yield self.store.update_pusher_failing_since(
+ await self.store.update_pusher_failing_since(
self.app_id, self.pushkey, self.user_id, self.failing_since
)
else:
@@ -280,18 +276,17 @@ class HttpPusher(object):
)
break
- @defer.inlineCallbacks
- def _process_one(self, push_action):
+ async def _process_one(self, push_action):
if "notify" not in push_action["actions"]:
return True
tweaks = push_rule_evaluator.tweaks_for_actions(push_action["actions"])
- badge = yield push_tools.get_badge_count(self.hs.get_datastore(), self.user_id)
+ badge = await push_tools.get_badge_count(self.hs.get_datastore(), self.user_id)
- event = yield self.store.get_event(push_action["event_id"], allow_none=True)
+ event = await self.store.get_event(push_action["event_id"], allow_none=True)
if event is None:
return True # It's been redacted
- rejected = yield self.dispatch_push(event, tweaks, badge)
+ rejected = await self.dispatch_push(event, tweaks, badge)
if rejected is False:
return False
@@ -305,11 +300,10 @@ class HttpPusher(object):
)
else:
logger.info("Pushkey %s was rejected: removing", pk)
- yield self.hs.remove_pusher(self.app_id, pk, self.user_id)
+ await self.hs.remove_pusher(self.app_id, pk, self.user_id)
return True
- @defer.inlineCallbacks
- def _build_notification_dict(self, event, tweaks, badge):
+ async def _build_notification_dict(self, event, tweaks, badge):
priority = "low"
if (
event.type == EventTypes.Encrypted
@@ -339,7 +333,7 @@ class HttpPusher(object):
}
return d
- ctx = yield push_tools.get_context_for_event(
+ ctx = await push_tools.get_context_for_event(
self.storage, self.state_handler, event, self.user_id
)
@@ -381,13 +375,12 @@ class HttpPusher(object):
return d
- @defer.inlineCallbacks
- def dispatch_push(self, event, tweaks, badge):
- notification_dict = yield self._build_notification_dict(event, tweaks, badge)
+ async def dispatch_push(self, event, tweaks, badge):
+ notification_dict = await self._build_notification_dict(event, tweaks, badge)
if not notification_dict:
return []
try:
- resp = yield self.http_client.post_json_get_json(
+ resp = await self.http_client.post_json_get_json(
self.url, notification_dict
)
except Exception as e:
@@ -404,8 +397,7 @@ class HttpPusher(object):
rejected = resp["rejected"]
return rejected
- @defer.inlineCallbacks
- def _send_badge(self, badge):
+ async def _send_badge(self, badge):
"""
Args:
badge (int): number of unread messages
@@ -428,7 +420,7 @@ class HttpPusher(object):
}
}
try:
- yield self.http_client.post_json_get_json(self.url, d)
+ await self.http_client.post_json_get_json(self.url, d)
http_badges_processed_counter.inc()
except Exception as e:
logger.warning(
|
