diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-24 12:57:46 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-24 13:05:30 +0000 |
| commit | 48e76979112f9a048a173626be112e4c40a1f489 (patch) | |
| tree | 363585e7d5201fdae3bc393495c994a55db0e654 /synapse | |
| parent | Merge pull request #2054 from matrix-org/erikj/user_iter_cursor (diff) | |
| download | synapse-48e76979112f9a048a173626be112e4c40a1f489.tar.xz | |
Add slave transaction store
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/app/client_reader.py | 2 | ||||
| -rw-r--r-- | synapse/app/media_repository.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index a821a6ce62..e4ea3ab933 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -29,6 +29,7 @@ from synapse.replication.slave.storage.keys import SlavedKeyStore from synapse.replication.slave.storage.room import RoomStore from synapse.replication.slave.storage.directory import DirectoryStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore +from synapse.replication.slave.storage.transactions import TransactionStore from synapse.rest.client.v1.room import PublicRoomListRestServlet from synapse.server import HomeServer from synapse.storage.client_ips import ClientIpStore @@ -63,6 +64,7 @@ class ClientReaderSlavedStore( DirectoryStore, SlavedApplicationServiceStore, SlavedRegistrationStore, + TransactionStore, BaseSlavedStore, ClientIpStore, # After BaseSlavedStore because the constructor is different ): diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index 3c7984a237..1444e69a42 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -24,6 +24,7 @@ from synapse.metrics.resource import MetricsResource, METRICS_PREFIX from synapse.replication.slave.storage._base import BaseSlavedStore from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore +from synapse.replication.slave.storage.transactions import TransactionStore from synapse.rest.media.v0.content_repository import ContentRepoResource from synapse.rest.media.v1.media_repository import MediaRepositoryResource from synapse.server import HomeServer @@ -59,6 +60,7 @@ logger = logging.getLogger("synapse.app.media_repository") class MediaRepositorySlavedStore( SlavedApplicationServiceStore, SlavedRegistrationStore, + TransactionStore, BaseSlavedStore, MediaRepositoryStore, ClientIpStore, |