diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index f8a1f12170..2f23bd8451 100644 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -507,19 +507,20 @@ def get_redis_conn(username=None, password=None): if not hasattr(frappe.local, "conf"): raise Exception("You need to call frappe.init") - elif not frappe.local.conf.redis_queue: + conf = frappe.get_site_config() + if not conf.redis_queue: raise Exception("redis_queue missing in common_site_config.json") global _redis_queue_conn cred = frappe._dict() - if frappe.conf.get("use_rq_auth"): + if conf.get("use_rq_auth"): if username: cred["username"] = username cred["password"] = password else: - cred["username"] = frappe.get_site_config().rq_username or get_bench_id() - cred["password"] = frappe.get_site_config().rq_password + cred["username"] = conf.rq_username or get_bench_id() + cred["password"] = conf.rq_password elif os.environ.get("RQ_ADMIN_PASWORD"): cred["username"] = "default" diff --git a/frappe/utils/redis_queue.py b/frappe/utils/redis_queue.py index 1afdd4a3ff..7ee3bd0ab1 100644 --- a/frappe/utils/redis_queue.py +++ b/frappe/utils/redis_queue.py @@ -17,21 +17,22 @@ class RedisQueue: @classmethod def get_connection(cls, username=None, password=None): - if frappe.conf.redis_queue_sentinel_enabled: + conf = frappe.get_site_config() + if conf.redis_queue_sentinel_enabled: from frappe.utils.redis_wrapper import get_sentinel_connection - sentinels = [tuple(node.split(":")) for node in frappe.conf.get("redis_queue_sentinels", [])] + sentinels = [tuple(node.split(":")) for node in conf.get("redis_queue_sentinels", [])] sentinel = get_sentinel_connection( sentinels=sentinels, - sentinel_username=frappe.conf.get("redis_queue_sentinel_username"), - sentinel_password=frappe.conf.get("redis_queue_sentinel_password"), - master_username=frappe.conf.get("redis_queue_master_username", username), - master_password=frappe.conf.get("redis_queue_master_password", password), + sentinel_username=conf.get("redis_queue_sentinel_username"), + sentinel_password=conf.get("redis_queue_sentinel_password"), + master_username=conf.get("redis_queue_master_username", username), + master_password=conf.get("redis_queue_master_password", password), ) - conn = sentinel.master_for(frappe.conf.get("redis_queue_master_service")) + conn = sentinel.master_for(conf.get("redis_queue_master_service")) conn.ping() return conn - conn = redis.from_url(frappe.conf.redis_queue, username=username, password=password) + conn = redis.from_url(conf.redis_queue, username=username, password=password) conn.ping() return conn