summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-08-16 15:42:50 +0100
committerGitHub <noreply@github.com>2018-08-16 15:42:50 +0100
commitb4d6db5c4a94281c634d2065e0045303ea8fe6ab (patch)
tree8fdd3286587872c7d1584eb31d51b7e987157e5c /synapse
parentAdd GET media/v1/config (#3184) (diff)
parentNewsfile (diff)
downloadsynapse-b4d6db5c4a94281c634d2065e0045303ea8fe6ab.tar.xz
Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_worker
Fix inbound federation on reader worker
Diffstat (limited to 'synapse')
-rw-r--r--synapse/app/federation_reader.py2
1 files changed, 2 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,