summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-20 16:21:34 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-20 16:21:34 +0100
commit24b93b9c76e0623c231abf37b84e0b841879b890 (patch)
tree8f7adcc4b4dd191fef56d2a011d1b5885f4767e0 /synapse/app
parentAdd a test room version which updates event ID format (#5210) (diff)
downloadsynapse-24b93b9c76e0623c231abf37b84e0b841879b890.tar.xz
Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200)"
This reverts commit ce5bcefc609db40740c692bd53a1ef84ab675e8c.

This caused:

```
Traceback (most recent call last):
  File "/usr/local/lib/python3.7/runpy.py", line 193, in _run_module_as_main
    "__main__", mod_spec)
  File "/usr/local/lib/python3.7/runpy.py", line 85, in _run_code
    exec(code, run_globals)
  File "/home/synapse/src/synapse/app/client_reader.py", line 32, in <module>
    from synapse.replication.slave.storage import SlavedProfileStore
ImportError: cannot import name 'SlavedProfileStore' from 'synapse.replication.slave.storage' (/home/synapse/src/synapse/replication/slave/storage/__init__.py)
error starting synapse.app.client_reader('/home/synapse/config/workers/client_reader.yaml') (exit code: 1); see above for logs
```
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/client_reader.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py
index 707f7c2f07..864f1eac48 100644
--- a/synapse/app/client_reader.py
+++ b/synapse/app/client_reader.py
@@ -29,7 +29,6 @@ from synapse.http.server import JsonResource
 from synapse.http.site import SynapseSite
 from synapse.metrics import RegistryProxy
 from synapse.metrics.resource import METRICS_PREFIX, MetricsResource
-from synapse.replication.slave.storage import SlavedProfileStore
 from synapse.replication.slave.storage._base import BaseSlavedStore
 from synapse.replication.slave.storage.account_data import SlavedAccountDataStore
 from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore
@@ -84,7 +83,6 @@ class ClientReaderSlavedStore(
     SlavedTransactionStore,
     SlavedClientIpStore,
     BaseSlavedStore,
-    SlavedProfileStore,
 ):
     pass