summary refs log tree commit diff
path: root/synapse/app/homeserver.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/homeserver.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/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index e0b87468fe..0b9d78c13c 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -20,6 +20,8 @@ import gc
 import logging
 import os
 import sys
+
+import synapse.config.logger
 from synapse.config._base import ConfigError
 
 from synapse.python_dependencies import (
@@ -286,7 +288,7 @@ def setup(config_options):
         # generating config files and shouldn't try to continue.
         sys.exit(0)
 
-    config.setup_logging()
+    synapse.config.logger.setup_logging(config, use_worker_options=False)
 
     # check any extra requirements we have now we have a config
     check_requirements(config)