diff options
author | Neil Johnson <neil@fragile.org.uk> | 2018-08-16 22:55:32 +0100 |
---|---|---|
committer | Neil Johnson <neil@fragile.org.uk> | 2018-08-16 22:55:32 +0100 |
commit | bcfeb44afe750dadd4199e7c02302b0157bdab11 (patch) | |
tree | a2c3bb85b247336c67f5a1dd653ee91c086bfc39 /synapse/storage | |
parent | block event creation and room creation on hitting resource limits (diff) | |
download | synapse-bcfeb44afe750dadd4199e7c02302b0157bdab11.tar.xz |
call reap on start up and fix under reaping bug
Diffstat (limited to 'synapse/storage')
-rw-r--r-- | synapse/storage/monthly_active_users.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/monthly_active_users.py b/synapse/storage/monthly_active_users.py index 7e417f811e..06f9a75a97 100644 --- a/synapse/storage/monthly_active_users.py +++ b/synapse/storage/monthly_active_users.py @@ -96,7 +96,10 @@ class MonthlyActiveUsersStore(SQLBaseStore): # While Postgres does not require 'LIMIT', but also does not support # negative LIMIT values. So there is no way to write it that both can # support - query_args = [self.hs.config.max_mau_value] + safe_guard = self.hs.config.max_mau_value - len(self.reserved_users) + # Must be greater than zero for postgres + safe_guard = safe_guard if safe_guard > 0 else 0 + query_args = [safe_guard] base_sql = """ DELETE FROM monthly_active_users |