diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-09 13:29:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-09 13:29:41 +0000 |
| commit | f31e65ca8b3a056b81c9ee1c8e5be298e36ed495 (patch) | |
| tree | 414d6a488f090cea0aff41ef8ca7346f47567a62 /synapse/config/logger.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf (diff) | |
| parent | D'oh: underscore, not hyphen (diff) | |
| download | synapse-f31e65ca8b3a056b81c9ee1c8e5be298e36ed495.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse/config/logger.py')
| -rw-r--r-- | synapse/config/logger.py | 4 |
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() |