diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-17 12:44:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 12:44:26 +0000 |
| commit | 69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc (patch) | |
| tree | a2a6e5b2b873ffb119d6124e4b9feae56bc22bbd /synapse/app | |
| parent | add new error type ResourceLimit (diff) | |
| parent | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff) | |
| download | synapse-69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc.tar.xz | |
Merge branch 'develop' into neilj/limit_exceeded_error
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/federation_reader.py | 2 | ||||
| -rwxr-xr-x | synapse/app/homeserver.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index 52522e9d33..7d8105778d 100644 --- a/synapse/app/federation_reader.py +++ b/synapse/app/federation_reader.py @@ -32,6 +32,7 @@ from synapse.http.site import SynapseSite from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource from synapse.replication.slave.storage._base import BaseSlavedStore +from synapse.replication.slave.storage.account_data import SlavedAccountDataStore from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore from synapse.replication.slave.storage.directory import DirectoryStore from synapse.replication.slave.storage.events import SlavedEventStore @@ -54,6 +55,7 @@ logger = logging.getLogger("synapse.app.federation_reader") class FederationReaderSlavedStore( + SlavedAccountDataStore, SlavedProfileStore, SlavedApplicationServiceStore, SlavedPusherStore, 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(): |