diff options
| author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:01:27 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:01:27 +0100 |
| commit | f7ececb0acca62d969c197df66f9864a49a75b78 (patch) | |
| tree | c1254c69f384eb7d3559936f956aa21c7e85755d /synapse/app/user_dir.py | |
| parent | Merge pull request #5890 from matrix-org/rei/rss_inc3 (diff) | |
| parent | Fix coverage in sytest and use plugins for buildkite (#5922) (diff) | |
| download | synapse-f7ececb0acca62d969c197df66f9864a49a75b78.tar.xz | |
Merge branch 'develop' into rei/rss_target
Diffstat (limited to 'synapse/app/user_dir.py')
| -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 |