summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-13 17:01:28 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-13 17:01:28 +0100
commitf03ddc98ec38771a329f47c13c76dd4e93fbef16 (patch)
tree47d892b419f6fa498d1f3f0d02d9746629dcbf8a /synapse/app
parentMerge branch 'develop' into dbkr/email_notifs_on_pusher (diff)
downloadsynapse-f03ddc98ec38771a329f47c13c76dd4e93fbef16.tar.xz
Use the SlavedAccountDataStore
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/pusher.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py
index 9d41b62db5..8ff8329f8e 100644
--- a/synapse/app/pusher.py
+++ b/synapse/app/pusher.py
@@ -24,10 +24,10 @@ from synapse.config.emailconfig import EmailConfig
 from synapse.http.site import SynapseSite
 from synapse.metrics.resource import MetricsResource, METRICS_PREFIX
 from synapse.storage.roommember import RoomMemberStore
-from synapse.storage.account_data import AccountDataStore
 from synapse.replication.slave.storage.events import SlavedEventStore
 from synapse.replication.slave.storage.pushers import SlavedPusherStore
 from synapse.replication.slave.storage.receipts import SlavedReceiptsStore
+from synapse.replication.slave.storage.account_data import SlavedAccountDataStore
 from synapse.storage.engines import create_engine
 from synapse.storage import DataStore
 from synapse.util.async import sleep
@@ -100,7 +100,8 @@ class PusherSlaveConfig(SlaveConfig, LoggingConfig, EmailConfig):
 
 
 class PusherSlaveStore(
-    SlavedEventStore, SlavedPusherStore, SlavedReceiptsStore
+    SlavedEventStore, SlavedPusherStore, SlavedReceiptsStore,
+    SlavedAccountDataStore
 ):
     update_pusher_last_stream_ordering_and_success = (
         DataStore.update_pusher_last_stream_ordering_and_success.__func__
@@ -130,14 +131,6 @@ class PusherSlaveStore(
         DataStore.get_profile_displayname.__func__
     )
 
-    get_global_account_data_by_type_for_users = (
-        AccountDataStore.__dict__["get_global_account_data_by_type_for_users"]
-    )
-
-    get_global_account_data_by_type_for_user = (
-        AccountDataStore.__dict__["get_global_account_data_by_type_for_user"]
-    )
-
     who_forgot_in_room = (
         RoomMemberStore.__dict__["who_forgot_in_room"]
     )