diff options
| author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:02:09 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:02:09 +0100 |
| commit | 60481031f2f1e43aaedc96a33441bfcf15262330 (patch) | |
| tree | b7f1e9e461e3034b1ca0fd75e6ea4ea185986cfb /synapse/app/homeserver.py | |
| parent | Count total_events and total_event_bytes within the loop. (diff) | |
| parent | Merge branch 'develop' into rei/rss_target (diff) | |
| download | synapse-60481031f2f1e43aaedc96a33441bfcf15262330.tar.xz | |
Merge branch 'rei/rss_target' into rei/rss_inc5 github/rei/rss_inc5 rei/rss_inc5
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: |