diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-08-28 21:18:53 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 21:18:53 +1000 |
| commit | 7dc398586c2156a456d9526ac0e42c1fec9f8143 (patch) | |
| tree | e5a21464decddbf9798495a351ddb3dbe6e250e4 /synapse/app/admin_cmd.py | |
| parent | Fix a cache-invalidation bug for worker-based deployments (#5920) (diff) | |
| download | synapse-7dc398586c2156a456d9526ac0e42c1fec9f8143.tar.xz | |
Implement a structured logging output system. (#5680)
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 |