diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
| commit | 88964b987e1d80d2dc9e81fc3ebc51afd9defbe1 (patch) | |
| tree | c98c28e51a8d52a8878cf2d888a4a110a835d8a8 /synapse/app/synchrotron.py | |
| parent | Document the additional routes for the event_creator worker (diff) | |
| parent | Merge pull request #3062 from matrix-org/revert-3053-speedup-mxid-check (diff) | |
| download | synapse-88964b987e1d80d2dc9e81fc3ebc51afd9defbe1.tar.xz | |
Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docs
Diffstat (limited to 'synapse/app/synchrotron.py')
| -rw-r--r-- | synapse/app/synchrotron.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index f87531f1b6..508b66613d 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -56,14 +56,12 @@ from synapse.util.manhole import manhole from synapse.util.stringutils import random_string from synapse.util.versionstring import get_version_string from twisted.internet import defer, reactor -from twisted.web.resource import Resource +from twisted.web.resource import NoResource 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"] ) @@ -273,7 +269,7 @@ class SynchrotronServer(HomeServer): "/_matrix/client/api/v1": resource, }) - root_resource = create_resource_tree(resources, Resource()) + root_resource = create_resource_tree(resources, NoResource()) _base.listen_tcp( bind_addresses, |