diff options
| author | Erik Johnston <erikj@jki.re> | 2018-02-28 18:02:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 18:02:03 +0000 |
| commit | 9cb3a190bc4dd71a4e64b73c02830471cc409514 (patch) | |
| tree | 15b19197bf78f9f0382bb901cfea771712fc176f /synapse/app | |
| parent | Merge pull request #2904 from matrix-org/erikj/receipt_cache_invalidation (diff) | |
| parent | Move storage functions for push calculations (diff) | |
| download | synapse-9cb3a190bc4dd71a4e64b73c02830471cc409514.tar.xz | |
Merge pull request #2913 from matrix-org/erikj/store_push
Move storage functions for push calculations
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/pusher.py | 5 | ||||
| -rw-r--r-- | synapse/app/synchrotron.py | 8 |
2 files changed, 2 insertions, 11 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 32ccea3f13..98a4a7c62c 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -32,7 +32,6 @@ from synapse.replication.tcp.client import ReplicationClientHandler from synapse.server import HomeServer from synapse.storage import DataStore from synapse.storage.engines import create_engine -from synapse.storage.roommember import RoomMemberStore from synapse.util.httpresourcetree import create_resource_tree from synapse.util.logcontext import LoggingContext, preserve_fn from synapse.util.manhole import manhole @@ -75,10 +74,6 @@ class PusherSlaveStore( DataStore.get_profile_displayname.__func__ ) - who_forgot_in_room = ( - RoomMemberStore.__dict__["who_forgot_in_room"] - ) - class PusherServer(HomeServer): def setup(self): diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index f87531f1b6..abe91dcfbd 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -62,8 +62,6 @@ logger = logging.getLogger("synapse.app.synchrotron") class SynchrotronSlavedStore( - SlavedPushRuleStore, - SlavedEventStore, SlavedReceiptsStore, SlavedAccountDataStore, SlavedApplicationServiceStore, @@ -73,14 +71,12 @@ class SynchrotronSlavedStore( SlavedGroupServerStore, SlavedDeviceInboxStore, SlavedDeviceStore, + SlavedPushRuleStore, + SlavedEventStore, SlavedClientIpStore, RoomStore, BaseSlavedStore, ): - who_forgot_in_room = ( - RoomMemberStore.__dict__["who_forgot_in_room"] - ) - did_forget = ( RoomMemberStore.__dict__["did_forget"] ) |