diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:33:44 -0700 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:33:44 -0700 |
| commit | 72d296a7f3b931e426b53f7725ab05b09dc1ea4b (patch) | |
| tree | cef44e834e13da97f12f25dbcda8c25cd4df6258 /synapse/app/homeserver.py | |
| parent | Cross-signing [1/4] -- hidden devices (#5759) (diff) | |
| parent | Add a link to python's logging config schema (#5926) (diff) | |
| download | synapse-72d296a7f3b931e426b53f7725ab05b09dc1ea4b.tar.xz | |
Merge branch 'develop' into uhoreg/e2e_cross-signing_merged
Diffstat (limited to 'synapse/app/homeserver.py')
| -rw-r--r-- | synapse/app/homeserver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 7d6b51b5bc..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: @@ -447,7 +447,7 @@ def setup(config_options): reactor.stop() sys.exit(1) - reactor.addSystemEventTrigger("before", "startup", start) + reactor.callWhenRunning(start) return hs |