Merge pull request #3662 from natefoo/ie-error-message

Display an error message when IE loading raises an exception
galaxyproject · Feb 24, 2017 · a5ea106 · a5ea106
2 parents 0baae35 + 585c107
commit a5ea106
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/galaxy/visualization/plugins/plugin.py b/lib/galaxy/visualization/plugins/plugin.py
@@ -274,7 +274,16 @@ def get_api_key():
             render_vars[ 'plugin_path' ] = os.path.abspath( self.path )
 
         if self.config.get( 'plugin_type', 'visualization' ) == "interactive_environment":
-            request = self.INTENV_REQUEST_FACTORY( trans, self )
+            try:
+                request = self.INTENV_REQUEST_FACTORY( trans, self )
+            except:
+                log.exception("IE plugin request handling failed")
+                return trans.fill_template( 'message.mako',
+                    message='Loading the interactive environment failed, please contact the {admin_tag} for assistance'.format(
+                        admin_tag='<a href="mailto:{admin_mail}">Galaxy administrator</a>'.format(
+                            admin_mail=trans.app.config.error_email_to)
+                        if trans.app.config.error_email_to else 'Galaxy administrator'),
+                    status='error')
             render_vars[ "ie_request" ] = request
 
         template_filename = self.config[ 'entry_point' ][ 'file' ]