diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-10 13:50:33 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-10 13:50:33 +0000 |
| commit | 30595b466f1f6b61eef15dc41562f6336e57e6fe (patch) | |
| tree | cd83159c37724b47cdf119cf8ddface8684a84a3 /synapse | |
| parent | Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-30595b466f1f6b61eef15dc41562f6336e57e6fe.tar.xz | |
Use yaml logging config format because it is much nicer
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/logger.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py index f9568ebd21..b18d08ec61 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,7 @@ class LoggingConfig(Config): logger.addHandler(handler) logger.info("Test") else: - logging.config.fileConfig(self.log_config) + logging.config.dictConfig(yaml.load(self.log_config)) observer = PythonLoggingObserver() observer.start() |