diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-28 14:46:08 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-28 14:46:08 +0000 |
| commit | 19fd4259284598a89036418de62e88a282db9566 (patch) | |
| tree | 2129256c6f81a4274f18c36ccd81173780949c59 /synapse/server.py | |
| parent | Change load limit params (diff) | |
| parent | Merge pull request #534 from matrix-org/erikj/setup (diff) | |
| download | synapse-19fd4259284598a89036418de62e88a282db9566.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
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 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): |