details: http://www.bx.psu.edu/hg/galaxy/rev/655868f3ef98 changeset: 3099:655868f3ef98 user: Enis Afgan afgane@gmail.com date: Tue Nov 17 16:39:05 2009 -0500 description: Fix cloud execution on startup
diffstat:
lib/galaxy/cloud/__init__.py | 2 +- lib/galaxy/config.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
diffs (30 lines):
diff -r 37406d8ad116 -r 655868f3ef98 lib/galaxy/cloud/__init__.py --- a/lib/galaxy/cloud/__init__.py Tue Nov 17 16:16:26 2009 -0500 +++ b/lib/galaxy/cloud/__init__.py Tue Nov 17 16:39:05 2009 -0500 @@ -61,7 +61,7 @@ def __init__( self, app ): self.app = app self.sa_session = app.model.context - if self.app.config.get_bool( "enable_cloud_execution", True ): + if self.app.config.enable_cloud_execution == True: # The dispatcher manager for underlying cloud instances - implements and contacts individual cloud providers self.provider = CloudProvider( app ) # Monitor for updating status of cloud instances diff -r 37406d8ad116 -r 655868f3ef98 lib/galaxy/config.py --- a/lib/galaxy/config.py Tue Nov 17 16:16:26 2009 -0500 +++ b/lib/galaxy/config.py Tue Nov 17 16:39:05 2009 -0500 @@ -114,11 +114,11 @@ self.tool_runners = [] self.datatypes_config = kwargs.get( 'datatypes_config_file', 'datatypes_conf.xml' ) # Cloud configuration options - self.cloud_controller_instance = string_as_bool( kwargs.get( 'cloud_controller_instance', False ) ) + self.cloud_controller_instance = string_as_bool( kwargs.get( 'cloud_controller_instance', 'False' ) ) if self.cloud_controller_instance == True: - self.enable_cloud_execution = string_as_bool( kwargs.get( 'enable_cloud_execution', True ) ) + self.enable_cloud_execution = string_as_bool( kwargs.get( 'enable_cloud_execution', 'True' ) ) else: - self.enable_cloud_execution = string_as_bool( kwargs.get( 'enable_cloud_execution', False ) ) + self.enable_cloud_execution = string_as_bool( kwargs.get( 'enable_cloud_execution', 'False' ) ) def get( self, key, default ): return self.config_dict.get( key, default ) def get_bool( self, key, default ):