Neilj/fix mau initial reserved users (#4211)

* fix transaction wrapping bug that caused get_user_id_by_threepid_txn to fail * towncrier * white space
matrix-org · Nov 28, 2018 · f9b136a · f9b136a
1 parent 944d524
commit f9b136a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/changelog.d/4211.bugfix b/changelog.d/4211.bugfix
@@ -0,0 +1,2 @@
+fix start up failure when mau_limit_reserved_threepids set and db is postgres 
+
diff --git a/synapse/storage/monthly_active_users.py b/synapse/storage/monthly_active_users.py
@@ -34,8 +34,9 @@ def __init__(self, dbconn, hs):
         self.hs = hs
         self.reserved_users = ()
         # Do not add more reserved users than the total allowable number
-        self._initialise_reserved_users(
-            dbconn.cursor(),
+        self._new_transaction(
+            dbconn, "initialise_mau_threepids", [], [],
+            self._initialise_reserved_users,
             hs.config.mau_limits_reserved_threepids[:self.hs.config.max_mau_value],
         )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix start up failure when mau_limit_reserved_threepids set and db is postgres