summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 14:30:26 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 14:30:26 +0000
commit91f0e411533b2cd6b120d7f5fbe0c558a105bdcb (patch)
treeb542074da8ec84541ad8dcb7b52db7e5aad66ba7
parentMerge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff)
parentyaml.load expects strings to be a yaml rather than file (diff)
downloadsynapse-91f0e411533b2cd6b120d7f5fbe0c558a105bdcb.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
-rw-r--r--synapse/config/logger.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index f9568ebd21..63c8e36930 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -18,6 +18,7 @@ from synapse.util.logcontext import LoggingContextFilter
 from twisted.python.log import PythonLoggingObserver
 import logging
 import logging.config
+import yaml
 
 
 class LoggingConfig(Config):
@@ -79,7 +80,8 @@ class LoggingConfig(Config):
             logger.addHandler(handler)
             logger.info("Test")
         else:
-            logging.config.fileConfig(self.log_config)
+            with open(self.log_config, 'r') as f:
+                logging.config.dictConfig(yaml.load(f))
 
         observer = PythonLoggingObserver()
         observer.start()