diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 20:32:25 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 20:32:25 +0100 |
| commit | 284e1cb027c2c5e8376a5b83d21d626e18dcbc33 (patch) | |
| tree | 39adfb627d806891d95ffabb0bd7490f1fc737eb /synapse/app/event_creator.py | |
| parent | Fix a bug with saml attribute maps. (diff) | |
| parent | fix sample config (diff) | |
| download | synapse-284e1cb027c2c5e8376a5b83d21d626e18dcbc33.tar.xz | |
Merge branch 'develop' into rav/fix_attribute_mapping
Diffstat (limited to 'synapse/app/event_creator.py')
| -rw-r--r-- | synapse/app/event_creator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/event_creator.py b/synapse/app/event_creator.py index 473c8895d0..c67fe69a50 100644 --- a/synapse/app/event_creator.py +++ b/synapse/app/event_creator.py @@ -175,8 +175,6 @@ def start(config_options): assert config.worker_replication_http_port is not None - setup_logging(config, use_worker_options=True) - # This should only be done on the user directory worker or the master config.update_user_directory = False @@ -192,6 +190,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 |