summary refs log tree commit diff
path: root/synapse/storage/monthly_active_users.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-12-04 14:07:28 +0000
committerRichard van der Hoff <richard@matrix.org>2018-12-04 14:07:28 +0000
commit002db39a36ecbe1b09775cb26cf756e436ab1d08 (patch)
treec46c70228af8f87dc5bfcb989383adb062e905ba /synapse/storage/monthly_active_users.py
parentRevert "Merge branch 'rav/timestamp_patch' into matrix-org-hotfixes" (diff)
parentfix upgrade.rst link again (diff)
downloadsynapse-002db39a36ecbe1b09775cb26cf756e436ab1d08.tar.xz
Merge tag 'v0.34.0rc1' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/monthly_active_users.py')
-rw-r--r--synapse/storage/monthly_active_users.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/monthly_active_users.py b/synapse/storage/monthly_active_users.py

index c353b11c9a..479e01ddc1 100644 --- a/synapse/storage/monthly_active_users.py +++ b/synapse/storage/monthly_active_users.py
@@ -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], )