diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:33:44 -0700 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:33:44 -0700 |
commit | 72d296a7f3b931e426b53f7725ab05b09dc1ea4b (patch) | |
tree | cef44e834e13da97f12f25dbcda8c25cd4df6258 /synapse/app/event_creator.py | |
parent | Cross-signing [1/4] -- hidden devices (#5759) (diff) | |
parent | Add a link to python's logging config schema (#5926) (diff) | |
download | synapse-72d296a7f3b931e426b53f7725ab05b09dc1ea4b.tar.xz |
Merge branch 'develop' into uhoreg/e2e_cross-signing_merged
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 |