Neilj/fix mau initial reserved users (#4211)

* fix transaction wrapping bug that caused get_user_id_by_threepid_txn to fail

* towncrier

* white space
pull/4244/head
Neil Johnson 2018-11-28 09:33:41 +00:00 committed by Amber Brown
parent 944d524f18
commit f9b136a886
2 changed files with 5 additions and 2 deletions

2
changelog.d/4211.bugfix Normal file
View File

@ -0,0 +1,2 @@
fix start up failure when mau_limit_reserved_threepids set and db is postgres

View File

@ -34,8 +34,9 @@ class MonthlyActiveUsersStore(SQLBaseStore):
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],
)