summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-05-01 14:04:39 +0100
committerMark Haines <mjark@negativecurvature.net>2015-05-01 14:04:39 +0100
commit7b50769eb95e61e9ae85ad46e5a387a64b68a3a7 (patch)
treef98784f34d5f0246aee6fcec7fabba20cd8cb27f /synapse/app/homeserver.py
parentNo id field on user (diff)
parentAllow generate-config to run against an existing config file to generate defa... (diff)
downloadsynapse-7b50769eb95e61e9ae85ad46e5a387a64b68a3a7.tar.xz
Merge pull request #136 from matrix-org/markjh/config_cleanup
Config restructuring.
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 3ce5fa4a43..d8d0df7e41 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -409,7 +409,6 @@ def setup(config_options):
         config.server_name,
         domain_with_port=domain_with_port,
         upload_dir=os.path.abspath("uploads"),
-        db_name=config.database_path,
         db_config=config.database_config,
         tls_context_factory=tls_context_factory,
         config=config,
@@ -422,9 +421,7 @@ def setup(config_options):
         redirect_root_to_web_client=True,
     )
 
-    db_name = hs.get_db_name()
-
-    logger.info("Preparing database: %s...", db_name)
+    logger.info("Preparing database: %r...", config.database_config)
 
     try:
         db_conn = database_engine.module.connect(
@@ -446,7 +443,7 @@ def setup(config_options):
         )
         sys.exit(1)
 
-    logger.info("Database prepared in %s.", db_name)
+    logger.info("Database prepared in %r.", config.database_config)
 
     if config.manhole:
         f = twisted.manhole.telnet.ShellFactory()