diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-12 11:42:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-12 11:42:43 +0000 |
| commit | 1ed836cc2b909e0bcd439964173008e9755c4750 (patch) | |
| tree | 65862dbcf81107332c0c7c65a2eda86eb6afc9ba /synapse/config/logger.py | |
| parent | Merge pull request #59 from matrix-org/hotfixes-v0.6.1f (diff) | |
| parent | Expand on caching (diff) | |
| download | synapse-1ed836cc2b909e0bcd439964173008e9755c4750.tar.xz | |
Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse v0.7.0
Diffstat (limited to 'synapse/config/logger.py')
| -rw-r--r-- | synapse/config/logger.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py index 15383b3184..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): @@ -66,7 +67,10 @@ class LoggingConfig(Config): formatter = logging.Formatter(log_format) if self.log_file: - handler = logging.FileHandler(self.log_file) + # TODO: Customisable file size / backup count + handler = logging.handlers.RotatingFileHandler( + self.log_file, maxBytes=(1000 * 1000 * 100), backupCount=3 + ) else: handler = logging.StreamHandler() handler.setFormatter(formatter) @@ -76,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() |