summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-28 14:32:05 +0000
committerErik Johnston <erik@matrix.org>2016-01-28 14:32:05 +0000
commit7ed2bbeb11d99ef97672497879e480f91db9b99b (patch)
treecb0d9fc2d3a7fe7db3980d25ed25a3cb2e6ff6ea /synapse/server.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/setup (diff)
downloadsynapse-7ed2bbeb11d99ef97672497879e480f91db9b99b.tar.xz
Clean up a bit. Add comment
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py

index e013a349c9..5fee7fe130 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -28,7 +28,7 @@ from synapse.notifier import Notifier from synapse.api.auth import Auth from synapse.handlers import Handlers from synapse.state import StateHandler -from synapse.storage import get_datastore +from synapse.storage import DataStore from synapse.util import Clock from synapse.util.distributor import Distributor from synapse.streams.events import EventSources @@ -117,7 +117,7 @@ class HomeServer(object): def setup(self): logger.info("Setting up.") - self.datastore = get_datastore(self) + self.datastore = DataStore(self.get_db_conn(), self) logger.info("Finished setting up.") def get_ip_from_request(self, request):