NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-02-05 06:46:25 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix job queue delete

Browse Source
This commit is contained in:
Arthur
2026-01-27 12:52:41 -08:00
parent baf3939ddb
commit 103ee1250e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox/core/models/jobs.py
+6 -3
View File
@@ -185,12 +185,15 @@ class Job(models.Model):
return f"{int(minutes)} minutes, {seconds:.2f} seconds" return f"{int(minutes)} minutes, {seconds:.2f} seconds"
def delete(self, *args, **kwargs): def delete(self, *args, **kwargs):
super().delete(*args, **kwargs)
# Use the stored queue name, or fall back to get_queue_for_model for legacy jobs # Use the stored queue name, or fall back to get_queue_for_model for legacy jobs
rq_queue_name = self.queue_name or get_queue_for_model(self.object_type.model if self.object_type else None) rq_queue_name = self.queue_name or get_queue_for_model(self.object_type.model if self.object_type else None)
rq_job_id = str(self.job_id)
super().delete(*args, **kwargs)
# Cancel the RQ job using the stored queue name
queue = django_rq.get_queue(rq_queue_name) queue = django_rq.get_queue(rq_queue_name)
job = queue.fetch_job(str(self.job_id)) job = queue.fetch_job(rq_job_id)
if job: if job:
try: try: