Skip to content

Commit

Permalink
move the configure_logging import to the app.py where it is used
Browse files Browse the repository at this point in the history
remove routes.middleware chatty logging as the PR is independent on this
  • Loading branch information
martenson committed Aug 5, 2016
1 parent 2116f97 commit 41acdad
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/galaxy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion lib/galaxy/webapps/tool_shed/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__ )

Expand All @@ -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 )
Expand Down
2 changes: 0 additions & 2 deletions lib/galaxy/webapps/tool_shed/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__ )

Expand Down

0 comments on commit 41acdad

Please sign in to comment.