From ebacca38631656c0bbed2d5a10337fae8eee8235 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 21 Jul 2023 11:45:06 +0530 Subject: [PATCH] fix: better job naming for enqueue_doc (#21755) DocType.method instead of frappe.utils.background_jobs.run_doc_method --- frappe/core/doctype/rq_job/rq_job.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/rq_job/rq_job.py b/frappe/core/doctype/rq_job/rq_job.py index 659c81e5c4..aaae8f6455 100644 --- a/frappe/core/doctype/rq_job/rq_job.py +++ b/frappe/core/doctype/rq_job/rq_job.py @@ -115,7 +115,13 @@ class RQJob(Document): def serialize_job(job: Job) -> frappe._dict: modified = job.last_heartbeat or job.ended_at or job.started_at or job.created_at - job_name = job.kwargs.get("kwargs", {}).get("job_type") or str(job.kwargs.get("job_name")) + job_kwargs = job.kwargs.get("kwargs", {}) + job_name = job_kwargs.get("job_type") or str(job.kwargs.get("job_name")) + if job_name == "frappe.utils.background_jobs.run_doc_method": + doctype = job_kwargs.get("doctype") + doc_method = job_kwargs.get("doc_method") + if doctype and doc_method: + job_name = f"{doctype}.{doc_method}" # function objects have this repr: '' # This regex just removes unnecessary things around it.