diff options
author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:01:52 +0100 |
---|---|---|
committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:01:52 +0100 |
commit | 7c0224d5c051bf6fb34cb372bb6aae928de4bc78 (patch) | |
tree | 57b7119644911027d4a73047412068bb002d7cb0 /synapse/app/synchrotron.py | |
parent | Code formatting (Black) (diff) | |
parent | Merge branch 'develop' into rei/rss_target (diff) | |
download | synapse-7c0224d5c051bf6fb34cb372bb6aae928de4bc78.tar.xz |
Merge branch 'rei/rss_target' into rei/rss_inc6
Diffstat (limited to 'synapse/app/synchrotron.py')
-rw-r--r-- | synapse/app/synchrotron.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index a1c3b162f7..473026fce5 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -435,8 +435,6 @@ def start(config_options): assert config.worker_app == "synapse.app.synchrotron" - setup_logging(config, use_worker_options=True) - synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts database_engine = create_engine(config.database_config) @@ -450,6 +448,8 @@ def start(config_options): application_service_handler=SynchrotronApplicationService(), ) + setup_logging(ss, config, use_worker_options=True) + ss.setup() reactor.addSystemEventTrigger( "before", "startup", _base.start, ss, config.worker_listeners |