summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-04-30 16:20:12 +0100
committerDavid Baker <dave@matrix.org>2015-04-30 16:21:39 +0100
commit5b02f334519964ffae6812df5413fcdae84db6ba (patch)
treed9b04ae0b1a3c219de94027e9b551d771ec1d607
parentDo access log using python's logging stuff, just under a separate logger name (diff)
downloadsynapse-5b02f334519964ffae6812df5413fcdae84db6ba.tar.xz
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.
-rw-r--r--synapse/config/logger.py16
1 files changed, 0 insertions, 16 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index 077f20497a..247b324816 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -27,7 +27,6 @@ class LoggingConfig(Config):
         self.verbosity = int(args.verbose) if args.verbose else None
         self.log_config = self.abspath(args.log_config)
         self.log_file = self.abspath(args.log_file)
-        self.access_log_file = self.abspath(args.access_log_file)
 
     @classmethod
     def add_arguments(cls, parser):
@@ -45,10 +44,6 @@ class LoggingConfig(Config):
             '--log-config', dest="log_config", default=None,
             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):
         log_format = (
@@ -83,17 +78,6 @@ class LoggingConfig(Config):
             handler.addFilter(LoggingContextFilter(request=""))
 
             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:
             with open(self.log_config, 'r') as f:
                 logging.config.dictConfig(yaml.load(f))