diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-11 10:03:24 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-11 10:03:24 +0000 |
| commit | 9978c5c10310512493b976f482f400bf30a78729 (patch) | |
| tree | 5afafbfa518af855eb654a4a060f692b0ae2332e /synapse/config | |
| parent | Merge branch 'develop' into application-services (diff) | |
| parent | Merge pull request #60 from matrix-org/single_source_version_and_dependencies (diff) | |
| download | synapse-9978c5c10310512493b976f482f400bf30a78729.tar.xz | |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/_base.py | 5 | ||||
| -rw-r--r-- | synapse/config/logger.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index dfc115d8e8..9b0f8c3c32 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,8 +50,9 @@ class Config(object): ) return cls.abspath(file_path) - @staticmethod - def ensure_directory(dir_path): + @classmethod + def ensure_directory(cls, dir_path): + dir_path = cls.abspath(dir_path) if not os.path.exists(dir_path): os.makedirs(dir_path) if not os.path.isdir(dir_path): 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() |