3 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/5ff4dc352d74/
Changeset: 5ff4dc352d74
User: dannon
Date: 2015-02-06 00:13:59+00:00
Summary: Relocate is_uwsgi to app.config (determined at configuration time via import).
Affected #: 2 files
diff -r 8f1d5b7b30c62231bfa4fa8f39fc6338726020ee -r 5ff4dc352d748b18fa1b8e75c68877b27108deb6 lib/galaxy/config.py
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -428,6 +428,18 @@
self.citation_cache_type = kwargs.get( "citation_cache_type", "file" )
self.citation_cache_data_dir = self.resolve_path( kwargs.get( "citation_cache_data_dir", "database/citations/data" ) )
self.citation_cache_lock_dir = self.resolve_path( kwargs.get( "citation_cache_lock_dir", "database/citations/locks" ) )
+ # TEST FOR UWSGI -- TODO save this somewhere so we only have to do it once.
+ self.is_uwsgi = False
+ try:
+ # The uwsgi module is automatically injected by the parent uwsgi
+ # process and only exists that way. If anything works, this is a
+ # uwsgi-managed process.
+ import uwsgi
+ if uwsgi.numproc:
+ self.is_uwsgi = True
+ except ImportError:
+ # This is not a uwsgi process, or something went horribly wrong.
+ pass
@property
def sentry_dsn_public( self ):
diff -r 8f1d5b7b30c62231bfa4fa8f39fc6338726020ee -r 5ff4dc352d748b18fa1b8e75c68877b27108deb6 lib/galaxy/webapps/galaxy/buildapp.py
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -86,20 +86,8 @@
# Wrap the webapp in some useful middleware
if kwargs.get( 'middleware', True ):
webapp = wrap_in_middleware( webapp, global_conf, **kwargs )
- # TEST FOR UWSGI -- TODO save this somewhere so we only have to do it once.
- is_uwsgi = False
- try:
- # The uwsgi module is automatically injected by the parent uwsgi
- # process and only exists that way. If anything works, this is a
- # uwsgi-managed process.
- import uwsgi
- is_uwsgi = uwsgi.numproc
- is_uwsgi = True
- except ImportError:
- # This is not a uwsgi process, or something went horribly wrong.
- pass
if asbool( kwargs.get( 'static_enabled', True) ):
- if is_uwsgi:
+ if app.config.is_uwsgi:
log.error("Static middleware is enabled in your configuration but this is a uwsgi process. Refusing to wrap in static middleware.")
else:
webapp = wrap_in_static( webapp, global_conf, plugin_frameworks=[ app.visualizations_registry ], **kwargs )
https://bitbucket.org/galaxy/galaxy-central/commits/20bd598e1f53/
Changeset: 20bd598e1f53
User: dannon
Date: 2015-02-06 00:15:10+00:00
Summary: Remove TODO about moving uwsgi test since I did it.
Affected #: 1 file
diff -r 5ff4dc352d748b18fa1b8e75c68877b27108deb6 -r 20bd598e1f5363518c8bfe44697a8e6f0dacff4e lib/galaxy/config.py
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -428,7 +428,7 @@
self.citation_cache_type = kwargs.get( "citation_cache_type", "file" )
self.citation_cache_data_dir = self.resolve_path( kwargs.get( "citation_cache_data_dir", "database/citations/data" ) )
self.citation_cache_lock_dir = self.resolve_path( kwargs.get( "citation_cache_lock_dir", "database/citations/locks" ) )
- # TEST FOR UWSGI -- TODO save this somewhere so we only have to do it once.
+ # TEST FOR UWSGI
self.is_uwsgi = False
try:
# The uwsgi module is automatically injected by the parent uwsgi
https://bitbucket.org/galaxy/galaxy-central/commits/17ed2655b305/
Changeset: 17ed2655b305
User: dannon
Date: 2015-02-06 00:16:19+00:00
Summary: Minor pep8'ing in lib/galaxy/config.py
Affected #: 1 file
diff -r 20bd598e1f5363518c8bfe44697a8e6f0dacff4e -r 17ed2655b3052c047aba60013e0f9bb173ebee90 lib/galaxy/config.py
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -124,7 +124,7 @@
self.hours_between_check = 12
self.update_integrated_tool_panel = kwargs.get( "update_integrated_tool_panel", True )
self.enable_data_manager_user_view = string_as_bool( kwargs.get( "enable_data_manager_user_view", "False" ) )
- self.galaxy_data_manager_data_path = kwargs.get( 'galaxy_data_manager_data_path', self.tool_data_path )
+ self.galaxy_data_manager_data_path = kwargs.get( 'galaxy_data_manager_data_path', self.tool_data_path )
self.tool_secret = kwargs.get( "tool_secret", "" )
self.id_secret = kwargs.get( "id_secret", "USING THE DEFAULT IS NOT SECURE!" )
self.retry_metadata_internally = string_as_bool( kwargs.get( "retry_metadata_internally", "True" ) )
@@ -381,7 +381,7 @@
self.amqp_internal_connection = kwargs.get('amqp_internal_connection')
# TODO Get extra amqp args as necessary for ssl
elif 'database_connection' in kwargs:
- self.amqp_internal_connection = "sqlalchemy+"+self.database_connection
+ self.amqp_internal_connection = "sqlalchemy+" + self.database_connection
else:
self.amqp_internal_connection = "sqlalchemy+sqlite:///%s?isolation_level=IMMEDIATE" % resolve_path( "database/control.sqlite", self.root )
self.biostar_url = kwargs.get( 'biostar_url', None )
@@ -485,7 +485,10 @@
# [0], probably moved their shed_tool_conf.xml as well
# [2]: user has done nothing, use the old files
# [3]: fresh install
- tool_config_file=[ 'config/tool_conf.xml,shed_tool_conf.xml', 'config/tool_conf.xml,config/shed_tool_conf.xml', 'tool_conf.xml,shed_tool_conf.xml', 'config/tool_conf.xml.sample,config/shed_tool_conf.xml' ]
+ tool_config_file=[ 'config/tool_conf.xml,shed_tool_conf.xml',
+ 'config/tool_conf.xml,config/shed_tool_conf.xml',
+ 'tool_conf.xml,shed_tool_conf.xml',
+ 'config/tool_conf.xml.sample,config/shed_tool_conf.xml' ]
)
for var, defaults in defaults.items():
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e7e6758d12d7/
Changeset: e7e6758d12d7
User: carlfeberhard
Date: 2015-02-05 22:36:26+00:00
Summary: Fix to 3abf1c3: pass app to super
Affected #: 1 file
diff -r 3abf1c30e4730fb84c8a3ab764661e19071a8e45 -r e7e6758d12d7835c843bf978061cf410e1cc778f lib/galaxy/managers/users.py
--- a/lib/galaxy/managers/users.py
+++ b/lib/galaxy/managers/users.py
@@ -206,7 +206,7 @@
"""
Convert a User and associated data to a dictionary representation.
"""
- super( UserSerializer, self ).__init__()
+ super( UserSerializer, self ).__init__( app )
self.user_manager = UserManager( app )
self.default_view = 'summary'
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.