From e8a22447fd6b9d5f077e2d6b8a0d1144b2cb20db Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Fri, 17 Nov 2017 17:08:31 -0500 Subject: [PATCH] Run jobs in web workers if no job-handlers farm is configured and using a default job conf (no job_conf.xml) --- lib/galaxy/util/handlers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/util/handlers.py b/lib/galaxy/util/handlers.py index f04191ae7a2..96501418d66 100644 --- a/lib/galaxy/util/handlers.py +++ b/lib/galaxy/util/handlers.py @@ -102,7 +102,9 @@ class ConfiguresHandlers: :return: bool """ - if self.app.application_stack.in_pool(self.app.application_stack.pools.JOB_HANDLERS): + if (self.app.application_stack.in_pool(self.app.application_stack.pools.JOB_HANDLERS) or + (not self.app.application_stack.has_pool(self.app.application_stack.pools.JOB_HANDLERS) and + self.app.job_config.is_default)): # Handlers started as uWSGI mules do not require configuration in the job conf return True for collection in self.handlers.values():