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/admin_cmd.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/admin_cmd.py')
| -rw-r--r-- | synapse/app/admin_cmd.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py index 1fd52a5526..04751a6a5e 100644 --- a/synapse/app/admin_cmd.py +++ b/synapse/app/admin_cmd.py @@ -227,8 +227,6 @@ def start(config_options): config.start_pushers = False config.send_federation = False - setup_logging(config, use_worker_options=True) - synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts database_engine = create_engine(config.database_config) @@ -241,6 +239,8 @@ def start(config_options): database_engine=database_engine, ) + setup_logging(ss, config, use_worker_options=True) + ss.setup() # We use task.react as the basic run command as it correctly handles tearing |