From c7218e87e2e71be072e80e18b959e5c66c0b3e45 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 24 Aug 2010 23:33:32 +0200
Subject: [PATCH] Don't let debug logging to file affect console logging (i.e.
 get rid of logging.basicConfig())

---
 mopidy/utils/log.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mopidy/utils/log.py b/mopidy/utils/log.py
index b903c7c7..cc1c19c1 100644
--- a/mopidy/utils/log.py
+++ b/mopidy/utils/log.py
@@ -4,10 +4,15 @@ import logging.handlers
 from mopidy import settings
 
 def setup_logging(verbosity_level, save_debug_log):
+    setup_root_logger()
     setup_console_logging(verbosity_level)
     if save_debug_log:
         setup_debug_logging_to_file()
 
+def setup_root_logger():
+    root = logging.getLogger('')
+    root.setLevel(logging.DEBUG)
+
 def setup_console_logging(verbosity_level):
     if verbosity_level == 0:
         log_level = logging.WARNING
@@ -18,15 +23,20 @@ def setup_console_logging(verbosity_level):
     else:
         log_level = logging.INFO
         log_format = settings.CONSOLE_LOG_FORMAT
-    logging.basicConfig(format=log_format, level=log_level)
+    formatter = logging.Formatter(log_format)
+    handler = logging.StreamHandler()
+    handler.setFormatter(formatter)
+    handler.setLevel(log_level)
+    root = logging.getLogger('')
+    root.addHandler(handler)
 
 def setup_debug_logging_to_file():
-    root = logging.getLogger('')
-    root.setLevel(logging.DEBUG)
     formatter = logging.Formatter(settings.DEBUG_LOG_FORMAT)
     handler = logging.handlers.RotatingFileHandler(
         settings.DEBUG_LOG_FILENAME, maxBytes=10485760, backupCount=3)
     handler.setFormatter(formatter)
+    handler.setLevel(logging.DEBUG)
+    root = logging.getLogger('')
     root.addHandler(handler)
 
 def indent(string, places=4, linebreak='\n'):