From ea6bc7be5d7c7e398457a2fbc287ef54a0b62628 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Sat, 18 Oct 2014 18:38:04 -0400 Subject: [PATCH] Bugfix: Do not hard code 'main' as Galaxy server name. Determine correct server name corresponding to at least a web request at runtime. --- .../plugins/visualizations/ipython/templates/ipython.mako | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/plugins/visualizations/ipython/templates/ipython.mako b/config/plugins/visualizations/ipython/templates/ipython.mako index 80dde3d6b10..2e04bd1acf6 100644 --- a/config/plugins/visualizations/ipython/templates/ipython.mako +++ b/config/plugins/visualizations/ipython/templates/ipython.mako @@ -11,7 +11,8 @@ import tempfile import subprocess import ConfigParser -galaxy_root_dir = os.path.abspath(trans.app.config.root) +galaxy_config = trans.app.config +galaxy_root_dir = os.path.abspath(galaxy_config.root) history_id = trans.security.encode_id( trans.history.id ) dataset_id = trans.security.encode_id( hda.id ) @@ -20,10 +21,11 @@ config.read( os.path.join( galaxy_root_dir, 'universe_wsgi.ini' ) ) # uWSGI galaxy installations don't use paster and only speak uWSGI not http try: - galaxy_paster_port = config.getint('server:main', 'port') + galaxy_paster_port = config.getint('server:%s' % galaxy_config.server_name, 'port') except: galaxy_paster_port = None + # Find out where we are viz_plugin_dir = config.get('app:main', 'visualization_plugins_directory') if not os.path.isabs(viz_plugin_dir):