summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 13:57:31 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 13:57:31 +0000
commitf91345bdb5b76ce76b99d4fc969ee4f41cbbba4c (patch)
tree507cb3a47a88a7c1a67b06f56598ec133913f77a /synapse/config
parentUse yaml logging config format because it is much nicer (diff)
downloadsynapse-f91345bdb5b76ce76b99d4fc969ee4f41cbbba4c.tar.xz
yaml.load expects strings to be a yaml rather than file
Diffstat (limited to '')
-rw-r--r--synapse/config/logger.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index b18d08ec61..63c8e36930 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -80,7 +80,8 @@ class LoggingConfig(Config):
             logger.addHandler(handler)
             logger.info("Test")
         else:
-            logging.config.dictConfig(yaml.load(self.log_config))
+            with open(self.log_config, 'r') as f:
+                logging.config.dictConfig(yaml.load(f))
 
         observer = PythonLoggingObserver()
         observer.start()