diff options
| author | Erik Johnston <erik@matrix.org> | 2019-02-27 13:43:53 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-02-27 13:43:53 +0000 |
| commit | 4cff9376f7b07d3c60b1f882cde5848149862dd9 (patch) | |
| tree | 3366179e8f7addba6205862f53b23bdc51b5843d | |
| parent | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoff (diff) | |
| download | synapse-4cff9376f7b07d3c60b1f882cde5848149862dd9.tar.xz | |
Move server key queries to federation reader
| -rw-r--r-- | docs/workers.rst | 1 | ||||
| -rw-r--r-- | synapse/app/federation_reader.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/workers.rst b/docs/workers.rst index 3ba5879f76..7552455a4e 100644 --- a/docs/workers.rst +++ b/docs/workers.rst @@ -182,6 +182,7 @@ endpoints matching the following regular expressions:: ^/_matrix/federation/v1/event_auth/ ^/_matrix/federation/v1/exchange_third_party_invite/ ^/_matrix/federation/v1/send/ + ^/_matrix/key/v2/query The above endpoints should all be routed to the federation_reader worker by the reverse-proxy configuration. diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index b116c17669..7da79dc827 100644 --- a/synapse/app/federation_reader.py +++ b/synapse/app/federation_reader.py @@ -21,7 +21,7 @@ from twisted.web.resource import NoResource import synapse from synapse import events -from synapse.api.urls import FEDERATION_PREFIX +from synapse.api.urls import FEDERATION_PREFIX, SERVER_KEY_V2_PREFIX from synapse.app import _base from synapse.config._base import ConfigError from synapse.config.homeserver import HomeServerConfig @@ -44,6 +44,7 @@ from synapse.replication.slave.storage.registration import SlavedRegistrationSto from synapse.replication.slave.storage.room import RoomStore from synapse.replication.slave.storage.transactions import SlavedTransactionStore from synapse.replication.tcp.client import ReplicationClientHandler +from synapse.rest.key.v2 import KeyApiV2Resource from synapse.server import HomeServer from synapse.storage.engines import create_engine from synapse.util.httpresourcetree import create_resource_tree @@ -99,6 +100,9 @@ class FederationReaderServer(HomeServer): ), }) + if name in ["keys", "federation"]: + resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self) + root_resource = create_resource_tree(resources, NoResource()) _base.listen_tcp( |