Merge pull request #49 from martenson/conf-logging

move the configure_logging import to the app.py where it is used

lib/galaxy/config.py

@@ -780,7 +780,7 @@ def configure_logging( config ):
         if disable_chatty_loggers:
             # Turn down paste httpserver logging
             if level <= logging.DEBUG:
-                for chatty_logger in ["paste.httpserver.ThreadPool", "routes.middleware"]:
+                for chatty_logger in ["paste.httpserver.ThreadPool"]:
                     logging.getLogger( chatty_logger ).setLevel( logging.WARN )
 
         # Remove old handlers

lib/galaxy/webapps/tool_shed/app.py

@@ -10,9 +10,11 @@
 from galaxy.openid.providers import OpenIDProviders
 from galaxy.util.dbkeys import GenomeBuilds
 from galaxy.web import security
+from galaxy.config import configure_logging
 import tool_shed.repository_registry
 import tool_shed.repository_types.registry
 from tool_shed.grids.repository_grid_filter_manager import RepositoryGridFilterManager
+
 import logging
 log = logging.getLogger( __name__ )
 
@@ -26,7 +28,7 @@ def __init__( self, **kwd ):
         # Read the tool_shed.ini configuration file and check for errors.
         self.config = config.Configuration( **kwd )
         self.config.check()
-        config.configure_logging( self.config )
+        configure_logging( self.config )
         # Initialize the  Galaxy datatypes registry.
         self.datatypes_registry = galaxy.datatypes.registry.Registry()
         self.datatypes_registry.load_datatypes( self.config.root, self.config.datatypes_config )

lib/galaxy/webapps/tool_shed/config.py

@@ -3,15 +3,13 @@
 """
 import os
 import re
-import sys
 import logging
 import logging.config
 import ConfigParser
 from datetime import timedelta
 from galaxy.util import string_as_bool
 from galaxy.web.formatting import expand_pretty_datetime_format
 from galaxy.version import VERSION, VERSION_MAJOR
-from galaxy.config import configure_logging
 
 log = logging.getLogger( __name__ )