diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-09-03 20:46:42 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-09-03 20:46:42 +0100 |
| commit | d9d156b5cdfe340a9b9c53b4002e5a14c5e9d68b (patch) | |
| tree | f44b103aabcb58979d5155731f7e05036c7333e0 /synapse/app/homeserver.py | |
| parent | Merge branch 'anoa/v2_lookup' of github.com:matrix-org/synapse into anoa/v2_l... (diff) | |
| parent | Fix docstring (diff) | |
| download | synapse-d9d156b5cdfe340a9b9c53b4002e5a14c5e9d68b.tar.xz | |
Merge branch 'develop' into anoa/v2_lookup
Diffstat (limited to 'synapse/app/homeserver.py')
| -rw-r--r-- | synapse/app/homeserver.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 8233905844..04f1ed14f3 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -341,8 +341,6 @@ def setup(config_options): # generating config files and shouldn't try to continue. sys.exit(0) - synapse.config.logger.setup_logging(config, use_worker_options=False) - events.USE_FROZEN_DICTS = config.use_frozen_dicts database_engine = create_engine(config.database_config) @@ -356,6 +354,8 @@ def setup(config_options): database_engine=database_engine, ) + synapse.config.logger.setup_logging(hs, config, use_worker_options=False) + logger.info("Preparing database: %s...", config.database_config["name"]) try: |