From 550f7a971b579b6f87c4d59ea9cf0cbe16c2fdf6 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 12 Jan 2014 01:42:41 +0100
Subject: [PATCH] log: Add verbosity_level 2 and 3

Reduces the amount of dependency logging on level 1, and increases the amount
on level 2 and 3. Fixes #593.
---
 mopidy/__main__.py  |  3 +-
 mopidy/commands.py  |  2 +-
 mopidy/utils/log.py | 67 +++++++++++++++++++++++++++++++--------------
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 1ddd76a4..ac5e2102 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -70,7 +70,8 @@ def main():
         if args.verbosity_level:
             verbosity_level += args.verbosity_level
 
-        log.setup_logging(config, verbosity_level, args.save_debug_log)
+        log.setup_logging(
+            config, installed_extensions, verbosity_level, args.save_debug_log)
 
         enabled_extensions = []
         for extension in installed_extensions:
diff --git a/mopidy/commands.py b/mopidy/commands.py
index e73f9373..ad20c47f 100644
--- a/mopidy/commands.py
+++ b/mopidy/commands.py
@@ -241,7 +241,7 @@ class RootCommand(Command):
         self.add_argument(
             '-v', '--verbose',
             action='count', dest='verbosity_level', default=0,
-            help='more output (debug level)')
+            help='more output (repeat up to 3 times for even more)')
         self.add_argument(
             '--save-debug-log',
             action='store_true', dest='save_debug_log',
diff --git a/mopidy/utils/log.py b/mopidy/utils/log.py
index 896fd707..9c88b368 100644
--- a/mopidy/utils/log.py
+++ b/mopidy/utils/log.py
@@ -31,12 +31,13 @@ def bootstrap_delayed_logging():
     root.addHandler(_delayed_handler)
 
 
-def setup_logging(config, verbosity_level, save_debug_log):
-    setup_console_logging(config, verbosity_level)
+def setup_logging(config, extensions, verbosity_level, save_debug_log):
     setup_log_levels(config)
 
+    setup_console_logging(config, extensions, verbosity_level)
+
     if save_debug_log:
-        setup_debug_logging_to_file(config)
+        setup_debug_logging_to_file(config, extensions)
 
     logging.captureWarnings(True)
 
@@ -51,29 +52,55 @@ def setup_log_levels(config):
         logging.getLogger(name).setLevel(level)
 
 
-def setup_console_logging(config, verbosity_level):
-    if verbosity_level < 0:
-        log_level = logging.WARNING
+LOG_LEVELS = {
+    -1: dict(root=logging.ERROR, mopidy=logging.WARNING),
+    0: dict(root=logging.ERROR, mopidy=logging.INFO),
+    1: dict(root=logging.WARNING, mopidy=logging.DEBUG),
+    2: dict(root=logging.INFO, mopidy=logging.DEBUG),
+    3: dict(root=logging.DEBUG, mopidy=logging.DEBUG),
+}
+
+
+def setup_console_logging(config, extensions, verbosity_level):
+    if verbosity_level < min(LOG_LEVELS.keys()):
+        verbosity_level = min(LOG_LEVELS.keys())
+    if verbosity_level > max(LOG_LEVELS.keys()):
+        verbosity_level = max(LOG_LEVELS.keys())
+
+    if verbosity_level < 1:
         log_format = config['logging']['console_format']
-    elif verbosity_level >= 1:
-        log_level = logging.DEBUG
-        log_format = config['logging']['debug_format']
     else:
-        log_level = logging.INFO
-        log_format = config['logging']['console_format']
+        log_format = config['logging']['debug_format']
     formatter = logging.Formatter(log_format)
-    handler = logging.StreamHandler()
-    handler.setFormatter(formatter)
-    handler.setLevel(log_level)
-    root = logging.getLogger('')
-    root.addHandler(handler)
+
+    root_handler = logging.StreamHandler()
+    root_handler.setFormatter(formatter)
+    root_handler.setLevel(LOG_LEVELS[verbosity_level]['root'])
+    logging.getLogger('').addHandler(root_handler)
+
+    mopidy_handler = logging.StreamHandler()
+    mopidy_handler.setFormatter(formatter)
+    mopidy_handler.setLevel(LOG_LEVELS[verbosity_level]['mopidy'])
+    add_mopidy_handler(extensions, mopidy_handler)
 
 
-def setup_debug_logging_to_file(config):
+def setup_debug_logging_to_file(config, extensions):
     formatter = logging.Formatter(config['logging']['debug_format'])
     handler = logging.handlers.RotatingFileHandler(
         config['logging']['debug_file'], maxBytes=10485760, backupCount=3)
     handler.setFormatter(formatter)
-    handler.setLevel(logging.DEBUG)
-    root = logging.getLogger('')
-    root.addHandler(handler)
+
+    logging.getLogger('').addHandler(handler)
+
+    # We must add our handler explicitly, since the mopidy* handlers don't
+    # propagate to the root handler.
+    add_mopidy_handler(extensions, handler)
+
+
+def add_mopidy_handler(extensions, handler):
+    names = ['mopidy_%s' % ext.ext_name for ext in extensions]
+    names.append('mopidy')
+    for name in names:
+        logger = logging.getLogger(name)
+        logger.propagate = False
+        logger.addHandler(handler)