diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 18:13:31 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 18:13:31 +0100 |
| commit | b65327ff661b87991566314cf07088a7e789b69b (patch) | |
| tree | 75da1c79db8165ee6b3676b784a0d567551cb82d /synapse/app/user_dir.py | |
| parent | better logging (diff) | |
| parent | fix sample config (diff) | |
| download | synapse-b65327ff661b87991566314cf07088a7e789b69b.tar.xz | |
Merge branch 'develop' into rav/saml_mapping_work
Diffstat (limited to '')
| -rw-r--r-- | synapse/app/user_dir.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py index cb29a1afab..e01afb39f2 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py @@ -197,8 +197,6 @@ def start(config_options): assert config.worker_app == "synapse.app.user_dir" - setup_logging(config, use_worker_options=True) - events.USE_FROZEN_DICTS = config.use_frozen_dicts database_engine = create_engine(config.database_config) @@ -223,6 +221,8 @@ def start(config_options): database_engine=database_engine, ) + setup_logging(ss, config, use_worker_options=True) + ss.setup() reactor.addSystemEventTrigger( "before", "startup", _base.start, ss, config.worker_listeners |