diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-14 11:35:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-14 11:35:05 +0000 |
| commit | bb256ac96f2a10b60708d5273bee5df2533f10b8 (patch) | |
| tree | ae6d19a234b566ff4fc58ec1d7b47c9622843b2c /synapse/app/synchrotron.py | |
| parent | Add new storage function to slave store (diff) | |
| parent | Merge pull request #1996 from matrix-org/erikj/fix_current_state (diff) | |
| download | synapse-bb256ac96f2a10b60708d5273bee5df2533f10b8.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_list_speed
Diffstat (limited to 'synapse/app/synchrotron.py')
| -rw-r--r-- | synapse/app/synchrotron.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 3f29595256..29f075aa5f 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -478,7 +478,7 @@ def start(config_options): assert config.worker_app == "synapse.app.synchrotron" - setup_logging(config.worker_log_config, config.worker_log_file) + setup_logging(config, use_worker_options=True) synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts |