Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into state-chache

This commit is contained in:
Erik Johnston 2015-02-10 14:30:26 +00:00
parent c86ebe7673 f91345bdb5
commit 91f0e41153
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/config/logger.py
View File

@ -18,6 +18,7 @@ from synapse.util.logcontext import LoggingContextFilter
from twisted.python.log import PythonLoggingObserver from twisted.python.log import PythonLoggingObserver
import logging import logging
import logging.config import logging.config
import yaml
class LoggingConfig(Config): class LoggingConfig(Config):
@ -79,7 +80,8 @@ class LoggingConfig(Config):
logger.addHandler(handler) logger.addHandler(handler)
logger.info("Test") logger.info("Test")
else: else:
logging.config.fileConfig(self.log_config) with open(self.log_config, 'r') as f:
logging.config.dictConfig(yaml.load(f))
observer = PythonLoggingObserver() observer = PythonLoggingObserver()
observer.start() observer.start()