Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 13:46:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix homeserver config parsing

Browse source
This commit is contained in:
Mark Haines 2014-09-01 15:51:15 +01:00
parent a9512d0994
commit 9ea1de432d
9 changed files with 66 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
synapse/config/logger.py
View file

@ -18,13 +18,13 @@ from ._base import Config
from twisted.python.log import PythonLoggingObserver
import logging
import logging.config
import os
class LoggingConfig(Config):
def __init__(self, args):
super(LoggingConfig, self).__init__(args)
self.verbosity = int(args.verbose) if args.verbose else None
self.log_config = os.path.abspath(args.log_config)
self.log_file = os.path.abspath(args.log_file)
self.log_config = self.abspath(args.log_config)
self.log_file = self.abspath(args.log_file)
@classmethod
def add_arguments(cls, parser):
@ -47,21 +47,21 @@ class LoggingConfig(Config):
log_format = (
'%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(message)s'
)
if self.config_path is None:
if self.log_config is None:
level = logging.INFO
if verbosity:
if self.verbosity:
level = logging.DEBUG
# FIXME: we need a logging.WARN for a -q quiet option
logging.basicConfig(
level=level,
filename=filename,
filename=self.log_file,
format=log_format
)
else:
logging.config.fileConfig(config_path)
logging.config.fileConfig(self.log_config)
observer = PythonLoggingObserver()
observer.start()