From c2898ec7f978b257ae6794e394a36a5fa68a7e7e Mon Sep 17 00:00:00 2001
From: Carl Eberhard <carlfeberhard@gmail.com>
Date: Tue, 19 Feb 2013 20:00:27 -0500
Subject: [PATCH] More reporting for buildbot corrections

---
 lib/galaxy/app.py           | 5 +++++
 scripts/functional_tests.py | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/app.py b/lib/galaxy/app.py
index 2075a51cdad..46056ed3180 100644
--- a/lib/galaxy/app.py
+++ b/lib/galaxy/app.py
@@ -20,6 +20,9 @@ from galaxy.sample_tracking import external_service_types
 from galaxy.openid.providers import OpenIDProviders
 from galaxy.tools.data_manager.manager import DataManagers
 
+import logging
+log = logging.getLogger( __name__ )
+
 class UniverseApplication( object ):
     """Encapsulates the state of a Universe application"""
     def __init__( self, **kwargs ):
@@ -41,6 +44,8 @@ class UniverseApplication( object ):
             self.tool_shed_registry = galaxy.tool_shed.tool_shed_registry.Registry( self.config.root, self.config.tool_sheds_config )
         else:
             self.tool_shed_registry = None
+        log.debug( 'self.config.tool_sheds_config: %s, self.tool_shed_registry: %s',
+            self.config.tool_sheds_config, self.tool_shed_registry )
         # Initialize database / check for appropriate schema version.  # If this
         # is a new installation, we'll restrict the tool migration messaging.
         from galaxy.model.migrate.check import create_or_verify_database
diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py
index 69635439043..f434501acac 100644
--- a/scripts/functional_tests.py
+++ b/scripts/functional_tests.py
@@ -277,7 +277,6 @@ def main():
                 os.makedirs( dir )
             except OSError:
                 pass
-    log.info( "Database connection:", database_connection )
 
     # ---- Build Application -------------------------------------------------- 
     app = None 
@@ -293,7 +292,7 @@ def main():
             kwargs[ 'object_store' ] = 'distributed'
             kwargs[ 'distributed_object_store_config_file' ] = 'distributed_object_store_conf.xml.sample'
         # Build the Universe Application
-        log.debug( 'app.kwargs:\n%s', pprint.pformat( kwargs ) )
+        print 'app.kwargs:\n%s' %( pprint.pformat( kwargs ) )
         app = UniverseApplication( job_queue_workers = 5,
                                    id_secret = 'changethisinproductiontoo',
                                    template_path = "templates",
@@ -321,6 +320,7 @@ def main():
                                    running_functional_tests=True,
                                    **kwargs )
         log.info( "Embedded Universe application started" )
+
     # ---- Run webserver ------------------------------------------------------
     server = None