Initial rewrite of logger.

Log messages are now fully handled by Python's logging framework. Since logger methods are
directly exposed, it is now possible to pass placeholders as arguments:

   logger.error("Caused by %s", object_with_expensive_to_string)

instead of

   logger.error("Caused by %s" % object_with_expensive_to_string)

This means debug messages are only formatted when they are enabled.

headphones/__init__.py

@@ -690,10 +690,10 @@ def initialize():
                 os.makedirs(LOG_DIR)
             except OSError:
                 if VERBOSE:
-                    print 'Unable to create the log directory. Logging to screen only.'
+                    sys.stderr.write('Unable to create the log directory. Logging to screen only.\n')
 
         # Start the logger, silence console logging if we need to
-        logger.headphones_log.initLogger(verbose=VERBOSE)
+        logger.initLogger(verbose=VERBOSE)
 
         if not CACHE_DIR:
             # Put the cache dir in the data dir for now

headphones/logger.py

@@ -14,83 +14,75 @@
 #  along with Headphones.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import threading
 import logging
-from logging import handlers
-
 import headphones
+
+from logging import handlers
 from headphones import helpers
 
-MAX_SIZE = 1000000 # 1mb
+MAX_SIZE = 1000000 # 1 MB
 MAX_FILES = 5
 
+FILENAME = 'headphones.log'
 
-# Simple rotating log handler that uses RotatingFileHandler
+# Headphones logger
-class RotatingLogger(object):
+logger = logging.getLogger('headphones')
 
-    def __init__(self, filename, max_size, max_files):
+class LogListHandler(logging.Handler):
-    
+    """
-        self.filename = filename
+    Log handler for Web UI.
-        self.max_size = max_size
+    """
-        self.max_files = max_files
-        
-        
-    def initLogger(self, verbose=1):
-    
-        l = logging.getLogger('headphones')
-        l.setLevel(logging.DEBUG)
-        
-        self.filename = os.path.join(headphones.LOG_DIR, self.filename)
-        
-        filehandler = handlers.RotatingFileHandler(self.filename, maxBytes=self.max_size, backupCount=self.max_files)
-        filehandler.setLevel(logging.DEBUG)
-        
-        fileformatter = logging.Formatter('%(asctime)s - %(levelname)-7s :: %(message)s', '%d-%b-%Y %H:%M:%S')
-        
-        filehandler.setFormatter(fileformatter)
-        l.addHandler(filehandler)
-        
-        if verbose:
-            consolehandler = logging.StreamHandler()
-            if verbose == 1:
-                consolehandler.setLevel(logging.INFO)
-            if verbose == 2:
-                consolehandler.setLevel(logging.DEBUG)
-            consoleformatter = logging.Formatter('%(asctime)s - %(levelname)s :: %(message)s', '%d-%b-%Y %H:%M:%S')
-            consolehandler.setFormatter(consoleformatter)
-            l.addHandler(consolehandler)    
-        
-    def log(self, message, level):
 
-        logger = logging.getLogger('headphones')
+    def emit(self, record):
-        
+        headphones.LOG_LIST.insert(0, (helpers.now(), record.msg, record.levelname, record.threadName))
-        threadname = threading.currentThread().getName()
-        
-        if level != 'DEBUG':
-            headphones.LOG_LIST.insert(0, (helpers.now(), message, level, threadname))
-        
-        message = threadname + ' : ' + message
 
-        if level == 'DEBUG':
+def initLogger(verbose=1):
-            logger.debug(message)
+    """
-        elif level == 'INFO':
+    Setup logging for Headphones. It uses the logger instance with the name
-            logger.info(message)
+    'headphones'. Three log handlers are added:
-        elif level == 'WARNING':
-            logger.warn(message)
-        else:
-            logger.error(message)
 
-headphones_log = RotatingLogger('headphones.log', MAX_SIZE, MAX_FILES)
+    * RotatingFileHandler: for the file headphones.log
+    * LogListHandler: for Web UI
+    * StreamHandler: for console (if verbose > 0)
+    """
 
-def debug(message):
+    # Configure the logger to accept all messages
-    headphones_log.log(message, level='DEBUG')
+    logger.propagate = False
+    logger.setLevel(logging.DEBUG)
 
-def info(message):
+    # Setup file logger
-    headphones_log.log(message, level='INFO')
+    filename = os.path.join(headphones.LOG_DIR, FILENAME)
-    
+
-def warn(message):
+    file_formatter = logging.Formatter('%(asctime)s - %(levelname)-7s :: %(threadName)s : %(message)s', '%d-%b-%Y %H:%M:%S')
-    headphones_log.log(message, level='WARNING')
+    file_handler = handlers.RotatingFileHandler(filename, maxBytes=MAX_SIZE, backupCount=MAX_FILES)
-    
+    file_handler.setLevel(logging.DEBUG)
-def error(message):
+    file_handler.setFormatter(file_formatter)
-    headphones_log.log(message, level='ERROR')
+
-    
+    logger.addHandler(file_handler)
+
+    # Add list logger
+    loglist_handler = LogListHandler()
+    loglist_handler.setLevel(logging.INFO)
+
+    logger.addHandler(loglist_handler)
+
+    # Setup console logger
+    if verbose:
+        console_formatter = logging.Formatter('%(asctime)s - %(levelname)s :: %(threadName)s : %(message)s', '%d-%b-%Y %H:%M:%S')
+        console_handler = logging.StreamHandler()
+        console_handler.setFormatter(console_formatter)
+
+        if verbose == 1:
+            console_handler.setLevel(logging.INFO)
+        elif verbose == 2:
+            console_handler.setLevel(logging.DEBUG)
+
+        logger.addHandler(console_handler)
+
+# Expose logger methods
+info = logger.info
+warn = logger.warn
+error = logger.error
+debug = logger.debug
+warning = logger.warning
+exception = logger.exception