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/frontend_proxy.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/frontend_proxy.py')
-rw-r--r-- | synapse/app/frontend_proxy.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py index e2822ca848..611d285421 100644 --- a/synapse/app/frontend_proxy.py +++ b/synapse/app/frontend_proxy.py @@ -232,8 +232,6 @@ def start(config_options): assert config.worker_main_http_uri is not None - setup_logging(config, use_worker_options=True) - events.USE_FROZEN_DICTS = config.use_frozen_dicts database_engine = create_engine(config.database_config) @@ -246,6 +244,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 |