diff options
| author | Neil Johnson <neil@matrix.org> | 2018-10-25 16:33:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 16:33:40 +0100 |
| commit | 95ad12885134ab1cdd0b21f1e0274e588220f681 (patch) | |
| tree | 754bb889ef44463125e6dc9c4dceb07c9949fa81 /synapse/app | |
| parent | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin (diff) | |
| parent | add new line (diff) | |
| download | synapse-95ad12885134ab1cdd0b21f1e0274e588220f681.tar.xz | |
Merge pull request #4081 from matrix-org/neilj/fix_mau_init
fix race condiftion in calling initialise_reserved_users
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 0b85b377e3..593e1e75db 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -553,14 +553,6 @@ def run(hs): generate_monthly_active_users, ) - # XXX is this really supposed to be a background process? it looks - # like it needs to complete before some of the other stuff runs. - run_as_background_process( - "initialise_reserved_users", - hs.get_datastore().initialise_reserved_users, - hs.config.mau_limits_reserved_threepids, - ) - start_generate_monthly_active_users() if hs.config.limit_usage_by_mau: clock.looping_call(start_generate_monthly_active_users, 5 * 60 * 1000) |