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

Undo changes to logger config, ie. remove the access_log_file option: decision is to support this through log_config rather tan adding an option.

This commit is contained in:
David Baker 2015-04-30 16:20:12 +01:00
parent 054aa0d58c
commit 5b02f33451
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
synapse/config/logger.py
View File

@ -27,7 +27,6 @@ class LoggingConfig(Config):
self.verbosity = int(args.verbose) if args.verbose else None self.verbosity = int(args.verbose) if args.verbose else None
self.log_config = self.abspath(args.log_config) self.log_config = self.abspath(args.log_config)
self.log_file = self.abspath(args.log_file) self.log_file = self.abspath(args.log_file)
self.access_log_file = self.abspath(args.access_log_file)
@classmethod @classmethod
def add_arguments(cls, parser): def add_arguments(cls, parser):
@ -45,10 +44,6 @@ class LoggingConfig(Config):
'--log-config', dest="log_config", default=None, '--log-config', dest="log_config", default=None,
help="Python logging config file" help="Python logging config file"
) )
logging_group.add_argument(
'--access-log-file', dest="access_log_file", default="access.log",
help="File to log server access to"
)
def setup_logging(self): def setup_logging(self):
log_format = ( log_format = (
@ -83,17 +78,6 @@ class LoggingConfig(Config):
handler.addFilter(LoggingContextFilter(request="")) handler.addFilter(LoggingContextFilter(request=""))
logger.addHandler(handler) logger.addHandler(handler)
if self.access_log_file:
access_logger = logging.getLogger('synapse.access')
# we log to both files by default
access_logger.propagate = 1
access_log_handler = logging.handlers.RotatingFileHandler(
self.access_log_file, maxBytes=(1000 * 1000 * 100), backupCount=3
)
access_log_formatter = logging.Formatter('%(message)s')
access_log_handler.setFormatter(access_log_formatter)
access_logger.addHandler(access_log_handler)
else: else:
with open(self.log_config, 'r') as f: with open(self.log_config, 'r') as f:
logging.config.dictConfig(yaml.load(f)) logging.config.dictConfig(yaml.load(f))