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

Merge branch 'release_20.09' into release_21.01

Browse Source
This commit is contained in:
mvdbeek
2021-02-23 08:58:14 +01:00
parent fbfff08736 61e25db6d0
commit 53ede0c2e4
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/workflow/scheduling_manager.py
+14 -11
View File
@@ -283,19 +283,22 @@ class WorkflowRequestMonitor(Monitors):
def __monitor(self):
to_monitor = self.workflow_scheduling_manager.active_workflow_schedulers
while self.monitor_running:
if self.invocation_grabber:
self.invocation_grabber.grab_unhandled_items()
try:
if self.invocation_grabber:
self.invocation_grabber.grab_unhandled_items()
monitor_step_timer = self.app.execution_timer_factory.get_timer(
'internal.galaxy.workflows.scheduling_manager.monitor_step',
'Workflow scheduling manager monitor step complete.'
)
for workflow_scheduler_id, workflow_scheduler in to_monitor.items():
if not self.monitor_running:
return
monitor_step_timer = self.app.execution_timer_factory.get_timer(
'internal.galaxy.workflows.scheduling_manager.monitor_step',
'Workflow scheduling manager monitor step complete.'
)
for workflow_scheduler_id, workflow_scheduler in to_monitor.items():
if not self.monitor_running:
return
self.__schedule(workflow_scheduler_id, workflow_scheduler)
log.trace(monitor_step_timer.to_str())
self.__schedule(workflow_scheduler_id, workflow_scheduler)
log.trace(monitor_step_timer.to_str())
except Exception:
log.exception('An exception occured scheduling while scheduling workflows')
self._monitor_sleep(1)
def __schedule(self, workflow_scheduler_id, workflow_scheduler):
tools/filters/secure_hash_message_digest.xml
+1 -2
View File
@@ -13,14 +13,13 @@
</command>
<inputs>
<param format="data" name="input1" type="data" label="Text file"/>
<param name="algorithms" type="select" multiple="True" display="checkboxes" label="Choose the algorithms">
<param name="algorithms" type="select" optional="false" multiple="true" display="checkboxes" label="Choose the algorithms">
<option value="md5"/>
<option value="sha1"/>
<option value="sha224"/>
<option value="sha256"/>
<option value="sha384"/>
<option value="sha512"/>
<validator type="no_options" message="You must select at least one algorithm." />
</param>
</inputs>
<outputs>