summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-28 13:33:04 +0000
committerErik Johnston <erik@matrix.org>2019-10-28 13:33:04 +0000
commitd0d8a22c13427cce341dbb7ae1d92d2c0ae709c3 (patch)
tree74b184875219b30a13008d36c6dcdee427e403b1 /synapse/push
parentMerge tag 'v1.5.0rc2' into develop (diff)
downloadsynapse-d0d8a22c13427cce341dbb7ae1d92d2c0ae709c3.tar.xz
Quick fix to ensure cache descriptors always return deferreds
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/bulk_push_rule_evaluator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
index 22491f3700..2bbdd11941 100644
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -79,7 +79,7 @@ class BulkPushRuleEvaluator(object):
             dict of user_id -> push_rules
         """
         room_id = event.room_id
-        rules_for_room = self._get_rules_for_room(room_id)
+        rules_for_room = yield self._get_rules_for_room(room_id)
 
         rules_by_user = yield rules_for_room.get_rules(event, context)