From 560b8be86f300789f140b34317e04228606b916c Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 20 Aug 2010 01:31:56 +0200
Subject: [PATCH] Move log setup to mopidy.utils.log

---
 mopidy/__main__.py  | 29 ++---------------------------
 mopidy/utils/log.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 27 deletions(-)
 create mode 100644 mopidy/utils/log.py

diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 247c68b3..fb22ddde 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -1,6 +1,4 @@
-import asyncore
 import logging
-import logging.handlers
 import multiprocessing
 import optparse
 import os
@@ -12,6 +10,7 @@ sys.path.insert(0,
 from mopidy import get_version, settings, SettingsError
 from mopidy.core import CoreProcess
 from mopidy.utils import get_class
+from mopidy.utils.log import setup_logging
 from mopidy.utils.path import get_or_create_folder
 from mopidy.utils.settings import list_settings_optparse_callback
 
@@ -19,7 +18,7 @@ logger = logging.getLogger('mopidy.main')
 
 def main():
     options = _parse_options()
-    _setup_logging(options.verbosity_level, options.dump)
+    setup_logging(options.verbosity_level, options.dump)
     settings.validate()
     logger.info('-- Starting Mopidy --')
     get_or_create_folder('~/.mopidy/')
@@ -30,7 +29,6 @@ def main():
     frontend.start_server(core_queue)
     core = CoreProcess(core_queue, output_class, backend_class, frontend)
     core.start()
-    #asyncore.loop()
     logger.debug('Main done')
 
 def _parse_options():
@@ -49,29 +47,6 @@ def _parse_options():
         help='list current settings')
     return parser.parse_args()[0]
 
-def _setup_logging(verbosity_level, dump):
-    _setup_console_logging(verbosity_level)
-    if dump:
-        _setup_dump_logging()
-
-def _setup_console_logging(verbosity_level):
-    if verbosity_level == 0:
-        level = logging.WARNING
-    elif verbosity_level == 2:
-        level = logging.DEBUG
-    else:
-        level = logging.INFO
-    logging.basicConfig(format=settings.CONSOLE_LOG_FORMAT, level=level)
-
-def _setup_dump_logging():
-    root = logging.getLogger('')
-    root.setLevel(logging.DEBUG)
-    formatter = logging.Formatter(settings.DUMP_LOG_FORMAT)
-    handler = logging.handlers.RotatingFileHandler(
-        settings.DUMP_LOG_FILENAME, maxBytes=102400, backupCount=3)
-    handler.setFormatter(formatter)
-    root.addHandler(handler)
-
 if __name__ == '__main__':
     try:
         main()
diff --git a/mopidy/utils/log.py b/mopidy/utils/log.py
new file mode 100644
index 00000000..e75a6df6
--- /dev/null
+++ b/mopidy/utils/log.py
@@ -0,0 +1,28 @@
+import logging
+import logging.handlers
+
+from mopidy import settings
+
+def setup_logging(verbosity_level, dump):
+    setup_console_logging(verbosity_level)
+    if dump:
+        setup_dump_logging()
+
+def setup_console_logging(verbosity_level):
+    if verbosity_level == 0:
+        level = logging.WARNING
+    elif verbosity_level == 2:
+        level = logging.DEBUG
+    else:
+        level = logging.INFO
+    logging.basicConfig(format=settings.CONSOLE_LOG_FORMAT, level=level)
+
+def setup_dump_logging():
+    root = logging.getLogger('')
+    root.setLevel(logging.DEBUG)
+    formatter = logging.Formatter(settings.DUMP_LOG_FORMAT)
+    handler = logging.handlers.RotatingFileHandler(
+        settings.DUMP_LOG_FILENAME, maxBytes=102400, backupCount=3)
+    handler.setFormatter(formatter)
+    root.addHandler(handler)
+