summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-23 10:28:10 +0100
committerErik Johnston <erik@matrix.org>2018-08-23 10:28:12 +0100
commit7a0da69eee49ce84ddd8a433288d7ce9cb76e14e (patch)
tree1e914c0f8331f412c916985a235446f88daeea9a /synapse/storage
parentMerge pull request #3680 from matrix-org/neilj/server_notices_on_blocking (diff)
downloadsynapse-7a0da69eee49ce84ddd8a433288d7ce9cb76e14e.tar.xz
Add missing yield
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/monthly_active_users.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/monthly_active_users.py b/synapse/storage/monthly_active_users.py
index 06f9a75a97..fd3b630bd2 100644
--- a/synapse/storage/monthly_active_users.py
+++ b/synapse/storage/monthly_active_users.py
@@ -147,6 +147,7 @@ class MonthlyActiveUsersStore(SQLBaseStore):
             return count
         return self.runInteraction("count_users", _count_users)
 
+    @defer.inlineCallbacks
     def upsert_monthly_active_user(self, user_id):
         """
             Updates or inserts monthly active user member
@@ -155,7 +156,7 @@ class MonthlyActiveUsersStore(SQLBaseStore):
             Deferred[bool]: True if a new entry was created, False if an
                 existing one was updated.
         """
-        is_insert = self._simple_upsert(
+        is_insert = yield self._simple_upsert(
             desc="upsert_monthly_active_user",
             table="monthly_active_users",
             keyvalues={