1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/85eb75521d87/
Changeset: 85eb75521d87
User: jmchilton
Date: 2015-01-30 20:54:02+00:00
Summary: Reduce config duplication related to setting up webapps.
And apply some fixes/improvements for galaxy back into tool shed and reports.
Affected #: 5 files
diff -r ce2f405062f677cf826a4cac0647a0e0f8beef65 -r
85eb75521d87ab7948a1ded816c267a6ed7904c5 config/reports_wsgi.ini.sample
--- a/config/reports_wsgi.ini.sample
+++ b/config/reports_wsgi.ini.sample
@@ -64,10 +64,10 @@
use_new_layout = true
# Serving static files (needed if running standalone)
-static_enabled = True
-static_cache_time = 360
-static_dir = %(here)s/static/
-static_images_dir = %(here)s/static/images
-static_favicon_dir = %(here)s/static/favicon.ico
-static_scripts_dir = %(here)s/static/scripts/
-static_style_dir = %(here)s/static/june_2007_style/blue
+# static_enabled = True
+# static_cache_time = 360
+# static_dir = %(here)s/static/
+# static_images_dir = %(here)s/static/images
+# static_favicon_dir = %(here)s/static/favicon.ico
+# static_scripts_dir = %(here)s/static/scripts/
+# static_style_dir = %(here)s/static/june_2007_style/blue
diff -r ce2f405062f677cf826a4cac0647a0e0f8beef65 -r
85eb75521d87ab7948a1ded816c267a6ed7904c5 lib/galaxy/web/framework/webapp.py
--- a/lib/galaxy/web/framework/webapp.py
+++ b/lib/galaxy/web/framework/webapp.py
@@ -814,3 +814,26 @@
template = Template( source=template_string,
searchList=[context or kwargs, dict(caller=self)] )
return str(template)
+
+
+def build_url_map( app, global_conf, local_conf ):
+ from paste.urlmap import URLMap
+ from galaxy.web.framework.middleware.static import CacheableStaticURLParser as
Static
+ urlmap = URLMap()
+ # Merge the global and local configurations
+ conf = global_conf.copy()
+ conf.update(local_conf)
+ # Get cache time in seconds
+ cache_time = conf.get( "static_cache_time", None )
+ if cache_time is not None:
+ cache_time = int( cache_time )
+ # Send to dynamic app by default
+ urlmap["/"] = app
+ # Define static mappings from config
+ urlmap["/static"] = Static( conf.get( "static_dir",
"./static/" ), cache_time )
+ urlmap["/images"] = Static( conf.get( "static_images_dir",
"./static/images" ), cache_time )
+ urlmap["/static/scripts"] = Static( conf.get(
"static_scripts_dir", "./static/scripts/" ), cache_time )
+ urlmap["/static/style"] = Static( conf.get( "static_style_dir",
"./static/style/blue" ), cache_time )
+ urlmap["/favicon.ico"] = Static( conf.get( "static_favicon_dir",
"./static/favicon.ico" ), cache_time )
+ urlmap["/robots.txt"] = Static( conf.get( "static_robots_txt",
"./static/robots.txt" ), cache_time )
+ return urlmap, cache_time
diff -r ce2f405062f677cf826a4cac0647a0e0f8beef65 -r
85eb75521d87ab7948a1ded816c267a6ed7904c5 lib/galaxy/webapps/galaxy/buildapp.py
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -610,26 +610,8 @@
return app
def wrap_in_static( app, global_conf, plugin_frameworks=None, **local_conf ):
- from paste.urlmap import URLMap
from galaxy.web.framework.middleware.static import CacheableStaticURLParser as
Static
- urlmap = URLMap()
- # Merge the global and local configurations
- conf = global_conf.copy()
- conf.update(local_conf)
- # Get cache time in seconds
- cache_time = conf.get( "static_cache_time", None )
- if cache_time is not None:
- cache_time = int( cache_time )
- # Send to dynamic app by default
- urlmap["/"] = app
- # Define static mappings from config
- urlmap["/static"] = Static( conf.get( "static_dir",
"./static/" ), cache_time )
- urlmap["/images"] = Static( conf.get( "static_images_dir",
"./static/images" ), cache_time )
- urlmap["/static/scripts"] = Static( conf.get(
"static_scripts_dir", "./static/scripts/" ), cache_time )
- urlmap["/static/style"] = Static( conf.get( "static_style_dir",
"./static/style/blue" ), cache_time )
- urlmap["/favicon.ico"] = Static( conf.get( "static_favicon_dir",
"./static/favicon.ico" ), cache_time )
- urlmap["/robots.txt"] = Static( conf.get( "static_robots_txt",
"./static/robots.txt" ), cache_time )
-
+ urlmap, cache_time = galaxy.web.framework.webapp.build_url_map( app, global_conf,
local_conf )
# wrap any static dirs for plugins
plugin_frameworks = plugin_frameworks or []
for framework in plugin_frameworks:
diff -r ce2f405062f677cf826a4cac0647a0e0f8beef65 -r
85eb75521d87ab7948a1ded816c267a6ed7904c5 lib/galaxy/webapps/reports/buildapp.py
--- a/lib/galaxy/webapps/reports/buildapp.py
+++ b/lib/galaxy/webapps/reports/buildapp.py
@@ -62,7 +62,7 @@
# Wrap the webapp in some useful middleware
if kwargs.get( 'middleware', True ):
webapp = wrap_in_middleware( webapp, global_conf, **kwargs )
- if kwargs.get( 'static_enabled', True ):
+ if asbool( kwargs.get( 'static_enabled', True ) ):
webapp = wrap_in_static( webapp, global_conf, **kwargs )
# Close any pooled database connections before forking
try:
@@ -135,25 +135,7 @@
return app
def wrap_in_static( app, global_conf, **local_conf ):
- from paste.urlmap import URLMap
- from galaxy.web.framework.middleware.static import CacheableStaticURLParser as
Static
- urlmap = URLMap()
- # Merge the global and local configurations
- conf = global_conf.copy()
- conf.update(local_conf)
- # Get cache time in seconds
- cache_time = conf.get( "static_cache_time", None )
- if cache_time is not None:
- cache_time = int( cache_time )
- # Send to dynamic app by default
- urlmap["/"] = app
- # Define static mappings from config
- urlmap["/static"] = Static( conf.get( "static_dir" ), cache_time
)
- urlmap["/images"] = Static( conf.get( "static_images_dir" ),
cache_time )
- urlmap["/static/scripts"] = Static( conf.get(
"static_scripts_dir" ), cache_time )
- urlmap["/static/style"] = Static( conf.get( "static_style_dir" ),
cache_time )
- urlmap["/favicon.ico"] = Static( conf.get( "static_favicon_dir"
), cache_time )
- # URL mapper becomes the root webapp
+ urlmap, _ = galaxy.web.framework.webapp.build_url_map( app, global_conf, local_conf
)
return urlmap
def build_template_error_formatters():
diff -r ce2f405062f677cf826a4cac0647a0e0f8beef65 -r
85eb75521d87ab7948a1ded816c267a6ed7904c5 lib/galaxy/webapps/tool_shed/buildapp.py
--- a/lib/galaxy/webapps/tool_shed/buildapp.py
+++ b/lib/galaxy/webapps/tool_shed/buildapp.py
@@ -134,7 +134,7 @@
# Wrap the webapp in some useful middleware
if kwargs.get( 'middleware', True ):
webapp = wrap_in_middleware( webapp, global_conf, **kwargs )
- if kwargs.get( 'static_enabled', True ):
+ if asbool( kwargs.get( 'static_enabled', True ) ):
webapp = wrap_in_static( webapp, global_conf, **kwargs )
# Close any pooled database connections before forking
try:
@@ -219,26 +219,7 @@
return app
def wrap_in_static( app, global_conf, **local_conf ):
- from paste.urlmap import URLMap
- from galaxy.web.framework.middleware.static import CacheableStaticURLParser as
Static
- urlmap = URLMap()
- # Merge the global and local configurations
- conf = global_conf.copy()
- conf.update(local_conf)
- # Get cache time in seconds
- cache_time = conf.get( "static_cache_time", None )
- if cache_time is not None:
- cache_time = int( cache_time )
- # Send to dynamic app by default
- urlmap["/"] = app
- # Define static mappings from config
- urlmap["/static"] = Static( conf.get( "static_dir",
"./static/" ), cache_time )
- urlmap["/images"] = Static( conf.get( "static_images_dir",
"./static/images" ), cache_time )
- urlmap["/static/scripts"] = Static( conf.get(
"static_scripts_dir", "./static/scripts/" ), cache_time )
- urlmap["/static/style"] = Static( conf.get( "static_style_dir",
"./static/style/blue" ), cache_time )
- urlmap["/favicon.ico"] = Static( conf.get( "static_favicon_dir",
"./static/favicon.ico" ), cache_time )
- urlmap["/robots.txt"] = Static( conf.get( "static_robots_txt",
"./static/robots.txt" ), cache_time )
- # URL mapper becomes the root webapp
+ urlmap, _ = galaxy.web.framework.webapp.build_url_map( app, global_conf, local_conf
)
return urlmap
def build_template_error_formatters():
Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.