diff options
author | Richard van der Hoff <richard@matrix.org> | 2017-03-13 12:20:47 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2017-03-13 12:20:47 +0000 |
commit | 3c69f324024db9868bdec42a9aceb666c48d209f (patch) | |
tree | 1e09876712257aebb5fb63c41c7e9c97908ba11e /synapse/app/media_repository.py | |
parent | Move FederationServer._handle_new_pdu to FederationHandler (diff) | |
parent | Merge pull request #1983 from matrix-org/rav/no_redirect_stdio (diff) | |
download | synapse-3c69f324024db9868bdec42a9aceb666c48d209f.tar.xz |
Merge remote-tracking branch 'origin/develop' into rav/refactor_received_pdu
Diffstat (limited to 'synapse/app/media_repository.py')
-rw-r--r-- | synapse/app/media_repository.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index ef17b158a5..c5579d9e38 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -168,7 +168,7 @@ def start(config_options): assert config.worker_app == "synapse.app.media_repository" - setup_logging(config.worker_log_config, config.worker_log_file) + setup_logging(config, use_worker_options=True) events.USE_FROZEN_DICTS = config.use_frozen_dicts |