summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-13 14:01:15 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 14:01:15 +0100
commit7ec9be9c53bb7f5f8b2ef07cf499c232c6137b39 (patch)
tree04a46e242026f2e6b4379b13e3332b9b61cf80ed /synapse/app/homeserver.py
parentMerge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff)
parentrename schema_prepare to prepare_database (diff)
downloadsynapse-7ec9be9c53bb7f5f8b2ef07cf499c232c6137b39.tar.xz
Merge pull request #300 from matrix-org/erikj/store_engine
Split out the schema preparation and update logic into its own module
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 190b03e2f7..af53acb369 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -35,9 +35,8 @@ if __name__ == '__main__':
 
 
 from synapse.storage.engines import create_engine, IncorrectDatabaseSetup
-from synapse.storage import (
-    are_all_users_on_domain, UpgradeDatabaseException,
-)
+from synapse.storage import are_all_users_on_domain
+from synapse.storage.prepare_database import UpgradeDatabaseException
 
 from synapse.server import HomeServer