From a053e8b33c2d3e1bc85562013f284bac0945e23c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 09:34:32 +0000 Subject: [PATCH] fix: allow custom queues (backport #15653) (#15667) * fix: allow custom queues (cherry picked from commit ab7077dd31c854f5a739f1a1a653e0fbffb2c53c) * fix: remove site config and reformat the code (cherry picked from commit b3e11c01ee08533e8ce151873e974730b16f26f7) * fix: remove redundant code (cherry picked from commit 51ae9a57fde9276877ef47a22d3a468a3fcfb479) Co-authored-by: Lucas Vazquez --- frappe/utils/background_jobs.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index b2592e9e8f..2c8b7f5fd3 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -20,11 +20,17 @@ from frappe.utils.redis_queue import RedisQueue from frappe.utils.commands import log +common_site_config = frappe.get_file_json("common_site_config.json") +custom_workers_config = common_site_config.get("workers", {}) default_timeout = 300 queue_timeout = { - 'long': 1500, - 'default': 300, - 'short': 300 + "default": default_timeout, + "short": default_timeout, + "long": 1500, + **{ + worker: config.get("timeout", default_timeout) + for worker, config in custom_workers_config.items() + } } redis_connection = None