summary refs log tree commit diff
path: root/synapse/config/logger.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-01 15:51:15 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-01 15:51:15 +0100
commit9ea1de432dedf2130a036fc9eb9d0b8515a24fe8 (patch)
tree88753b866924c2d247ae9277d801fbcef1a0d513 /synapse/config/logger.py
parentMerge branch 'develop' into server2server_tls (diff)
downloadsynapse-9ea1de432dedf2130a036fc9eb9d0b8515a24fe8.tar.xz
Fix homeserver config parsing
Diffstat (limited to 'synapse/config/logger.py')
-rw-r--r--synapse/config/logger.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index d34532c41a..8db6621ae8 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -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()