diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 15:05:31 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 15:05:31 +0100 |
| commit | b789c7eb03aaadee8d5e2f289a4c100fc01f71b8 (patch) | |
| tree | da9216150b667cd83fbc416b2431671fb5215d86 /synapse/app/federation_sender.py | |
| parent | Add changelog (diff) | |
| parent | fix sample config (diff) | |
| download | synapse-b789c7eb03aaadee8d5e2f289a4c100fc01f71b8.tar.xz | |
Merge branch 'develop' into rav/saml_config_cleanup
Diffstat (limited to 'synapse/app/federation_sender.py')
| -rw-r--r-- | synapse/app/federation_sender.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py index c5a2880e69..04fbb407af 100644 --- a/synapse/app/federation_sender.py +++ b/synapse/app/federation_sender.py @@ -171,8 +171,6 @@ def start(config_options): assert config.worker_app == "synapse.app.federation_sender" - setup_logging(config, use_worker_options=True) - events.USE_FROZEN_DICTS = config.use_frozen_dicts database_engine = create_engine(config.database_config) @@ -197,6 +195,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 |