From e39581e6faf09a8f98d1ddc3f1c438e4570d30a0 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Fri, 30 Jan 2015 17:40:25 -0500 Subject: [PATCH] Another round of reports config improvements. - Respect GALAXY_CONFIG_* when configuring reports web app. - Leave new_file_path and file_path unset in reports config (all defaults should be unspecified and environment variables are more useful). --- config/reports_wsgi.ini.sample | 4 ++-- lib/galaxy/webapps/reports/buildapp.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/reports_wsgi.ini.sample b/config/reports_wsgi.ini.sample index 2190353b1cc..066f2e92710 100644 --- a/config/reports_wsgi.ini.sample +++ b/config/reports_wsgi.ini.sample @@ -22,9 +22,9 @@ log_level = DEBUG # database_connection = postgres:///galaxy_test?user=postgres&password=postgres # Where dataset files are saved -file_path = database/files +#file_path = database/files # Temporary storage for additional datasets, this should be shared through the cluster -new_file_path = database/tmp +#new_file_path = database/tmp # Mako templates are compiled as needed and cached for reuse, this directory is # used for the cache diff --git a/lib/galaxy/webapps/reports/buildapp.py b/lib/galaxy/webapps/reports/buildapp.py index b681090098e..b5fc37284b8 100644 --- a/lib/galaxy/webapps/reports/buildapp.py +++ b/lib/galaxy/webapps/reports/buildapp.py @@ -16,6 +16,7 @@ from galaxy.util import asbool import galaxy.model import galaxy.model.mapping import galaxy.web.framework.webapp +from galaxy.util.properties import load_app_properties log = logging.getLogger( __name__ ) @@ -46,6 +47,9 @@ def add_ui_controllers( webapp, app ): def app_factory( global_conf, **kwargs ): """Return a wsgi application serving the root object""" # Create the Galaxy application unless passed in + kwargs = load_app_properties( + kwds=kwargs + ) if 'app' in kwargs: app = kwargs.pop( 'app' ) else: