Skip to content
Snippets Groups Projects
Unverified Commit bdbeeb94 authored by Erik Johnston's avatar Erik Johnston Committed by GitHub
Browse files

Fix setting `mau_limit_reserved_threepids` config (#6793)

Calling the invalidation function during initialisation of the data
stores introduces a circular dependency, causing Synapse to fail to
start.
parent 9bae7405
No related branches found
No related tags found
No related merge requests found
Fix bug where setting `mau_limit_reserved_threepids` config would cause Synapse to refuse to start.
...@@ -121,7 +121,13 @@ class MonthlyActiveUsersStore(MonthlyActiveUsersWorkerStore): ...@@ -121,7 +121,13 @@ class MonthlyActiveUsersStore(MonthlyActiveUsersWorkerStore):
if user_id: if user_id:
is_support = self.is_support_user_txn(txn, user_id) is_support = self.is_support_user_txn(txn, user_id)
if not is_support: if not is_support:
self.upsert_monthly_active_user_txn(txn, user_id) # We do this manually here to avoid hitting #6791
self.db.simple_upsert_txn(
txn,
table="monthly_active_users",
keyvalues={"user_id": user_id},
values={"timestamp": int(self._clock.time_msec())},
)
else: else:
logger.warning("mau limit reserved threepid %s not found in db" % tp) logger.warning("mau limit reserved threepid %s not found in db" % tp)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment