diff options
| author | Erik Johnston <erik@matrix.org> | 2017-07-06 10:36:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-07-06 10:36:25 +0100 |
| commit | 42b50483be2b022735f8ae2107314d51e92e8471 (patch) | |
| tree | 6b41c2096b105f04244ce80e840d0f998dbe226f /synapse/app/client_reader.py | |
| parent | Merge pull request #2282 from matrix-org/release-v0.21.1 (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-42b50483be2b022735f8ae2107314d51e92e8471.tar.xz | |
Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse v0.22.0
Diffstat (limited to 'synapse/app/client_reader.py')
| -rw-r--r-- | synapse/app/client_reader.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index 9b72c649ac..09bc1935f1 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -24,6 +24,7 @@ from synapse.http.server import JsonResource 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.client_ips import SlavedClientIpStore from synapse.replication.slave.storage.events import SlavedEventStore from synapse.replication.slave.storage.keys import SlavedKeyStore from synapse.replication.slave.storage.room import RoomStore @@ -33,7 +34,6 @@ from synapse.replication.slave.storage.transactions import TransactionStore from synapse.replication.tcp.client import ReplicationClientHandler from synapse.rest.client.v1.room import PublicRoomListRestServlet from synapse.server import HomeServer -from synapse.storage.client_ips import ClientIpStore from synapse.storage.engines import create_engine from synapse.util.httpresourcetree import create_resource_tree from synapse.util.logcontext import LoggingContext, PreserveLoggingContext @@ -65,8 +65,8 @@ class ClientReaderSlavedStore( SlavedApplicationServiceStore, SlavedRegistrationStore, TransactionStore, + SlavedClientIpStore, BaseSlavedStore, - ClientIpStore, # After BaseSlavedStore because the constructor is different ): pass |