summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-17 12:44:26 +0000
committerGitHub <noreply@github.com>2018-08-17 12:44:26 +0000
commit69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc (patch)
treea2a6e5b2b873ffb119d6124e4b9feae56bc22bbd /synapse/app/homeserver.py
parentadd new error type ResourceLimit (diff)
parentMerge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff)
downloadsynapse-69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc.tar.xz
Merge branch 'develop' into neilj/limit_exceeded_error
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index a98bb506e5..005921dcf7 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py
@@ -525,6 +525,7 @@ def run(hs): clock.looping_call( hs.get_datastore().reap_monthly_active_users, 1000 * 60 * 60 ) + hs.get_datastore().reap_monthly_active_users() @defer.inlineCallbacks def generate_monthly_active_users():