summary refs log tree commit diff
path: root/synapse/app/synchrotron.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-03-13 12:20:07 +0000
committerGitHub <noreply@github.com>2017-03-13 12:20:07 +0000
commit6bfe8e32b5305d9fc2e161936659f1899aa46e5a (patch)
tree284daa8e83a03d6fdfa885d7869e0d7db3519d9c /synapse/app/synchrotron.py
parentMerge pull request #1982 from matrix-org/rav/sighup_for_logconfig (diff)
parentAdd an option to disable stdio redirect (diff)
downloadsynapse-6bfe8e32b5305d9fc2e161936659f1899aa46e5a.tar.xz
Merge pull request #1983 from matrix-org/rav/no_redirect_stdio
Add an option to disable stdio redirect
Diffstat (limited to 'synapse/app/synchrotron.py')
-rw-r--r--synapse/app/synchrotron.py2
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