diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-08 15:55:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 15:55:47 +0000 |
| commit | d2f3ef98ac21929805f63a8a4964c3b97a22d1e1 (patch) | |
| tree | 7eac0a444d3b04cb11d49a28b0d61a7c4f795d2d /synapse/app | |
| parent | Ability to disable client/server Synapse via conf toggle (diff) | |
| parent | Merge pull request #3662 from matrix-org/neilj/reserved_users (diff) | |
| download | synapse-d2f3ef98ac21929805f63a8a4964c3b97a22d1e1.tar.xz | |
Merge branch 'develop' into neilj/disable_hs
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 3a67db8b30..a4a65e7286 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -518,6 +518,8 @@ def run(hs): # If you increase the loop period, the accuracy of user_daily_visits # table will decrease clock.looping_call(generate_user_daily_visit_stats, 5 * 60 * 1000) + + # monthly active user limiting functionality clock.looping_call( hs.get_datastore().reap_monthly_active_users, 1000 * 60 * 60 ) @@ -530,9 +532,13 @@ def run(hs): current_mau_gauge.set(float(count)) max_mau_value_gauge.set(float(hs.config.max_mau_value)) + hs.get_datastore().initialise_reserved_users( + hs.config.mau_limits_reserved_threepids + ) generate_monthly_active_users() if hs.config.limit_usage_by_mau: clock.looping_call(generate_monthly_active_users, 5 * 60 * 1000) + # End of monthly active user settings if hs.config.report_stats: logger.info("Scheduling stats reporting for 3 hour intervals") |