opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enhance the hours_between_check config setting to handle float values in addition to int values. This allows for functional tests to test the Galaxy update manager.

Browse Source
This commit is contained in:
Greg Von Kuster
2013-03-08 09:14:23 -05:00
parent 30ff3e3c54
commit d2598a9a1e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/config.py
+8 -3
View File
@@ -69,9 +69,14 @@ class Configuration( object ):
self.shed_tool_data_table_config = resolve_path( kwargs.get( 'shed_tool_data_table_config', 'shed_tool_data_table_conf.xml' ), self.root )
self.enable_tool_shed_check = string_as_bool( kwargs.get( 'enable_tool_shed_check', False ) )
try:
self.hours_between_check = int( kwargs.get( 'hours_between_check', 12 ) )
if self.hours_between_check < 1 or self.hours_between_check > 24:
self.hours_between_check = 12
self.hours_between_check = kwargs.get( 'hours_between_check', 12 )
if isinstance( hours_between_check, float ):
# Float values are supported for functional tests.
if self.hours_between_check < 0.001 or self.hours_between_check > 24.0:
self.hours_between_check = 12.0
else:
if self.hours_between_check < 1 or self.hours_between_check > 24:
self.hours_between_check = 12
except:
self.hours_between_check = 12
self.update_integrated_tool_panel = kwargs.get( "update_integrated_tool_panel", True )
lib/tool_shed/galaxy_install/update_manager.py
+1 -1
View File
@@ -18,7 +18,7 @@ class UpdateManager( object ):
self.sleeper = Sleeper()
self.restarter = threading.Thread( target=self.__restarter )
self.restarter.start()
self.seconds_to_sleep = app.config.hours_between_check * 3600
self.seconds_to_sleep = int( app.config.hours_between_check * 3600 )
def __restarter( self ):
log.info( 'Update manager restarter starting up...' )
while self.running: