diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-08-06 10:52:50 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-08-06 10:52:50 +0100 |
| commit | 118a9eafb31fbd51d23ef8abbaac481579b7f9e5 (patch) | |
| tree | ba84cd874fbe43c4981abaa3d8aa2c9913d5097b /synapse/server.py | |
| parent | Incorporate review (diff) | |
| parent | Fixup worker doc (again) (#8000) (diff) | |
| download | synapse-118a9eafb31fbd51d23ef8abbaac481579b7f9e5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_push_rules
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py index 8e41112530..81d7f26f9c 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -105,7 +105,7 @@ from synapse.server_notices.worker_server_notices_sender import ( WorkerServerNoticesSender, ) from synapse.state import StateHandler, StateResolutionHandler -from synapse.storage import DataStore, DataStores, Storage +from synapse.storage import Databases, DataStore, Storage from synapse.streams.events import EventSources from synapse.util import Clock from synapse.util.distributor import Distributor @@ -280,7 +280,7 @@ class HomeServer(object): def setup(self): logger.info("Setting up.") self.start_time = int(self.get_clock().time()) - self.datastores = DataStores(self.DATASTORE_CLASS, self) + self.datastores = Databases(self.DATASTORE_CLASS, self) logger.info("Finished setting up.") def setup_master(self): |