NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 00:58:16 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Changes requested by arthanson

Browse Source
This commit is contained in:
jchambers2012 2024-06-20 18:46:44 -04:00
parent d8868ed153
commit 5676c4abad
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netbox/core/models/jobs.py
View File

@ -217,17 +217,16 @@ class Job(models.Model):
interval: Recurrence interval (in minutes) interval: Recurrence interval (in minutes)
""" """
object_type = ObjectType.objects.get_for_model(instance, for_concrete_model=False) object_type = ObjectType.objects.get_for_model(instance, for_concrete_model=False)
if rq_queue_name is None: queue = None
rq_queue_name = get_queue_for_model(object_type.model) if rq_queue_name:
queue = django_rq.get_queue(rq_queue_name)
else:
try: try:
queue = django_rq.get_queue(rq_queue_name) queue = django_rq.get_queue(rq_queue_name)
except KeyError: except:
# User defined queue does not exist - return to default logic # User defined queue casued an error - return to default logic
rq_queue_name = get_queue_for_model(object_type.model) pass
queue = django_rq.get_queue(rq_queue_name) if not queue:
rq_queue_name = get_queue_for_model(object_type.model)
queue = django_rq.get_queue(rq_queue_name)
status = JobStatusChoices.STATUS_SCHEDULED if schedule_at else JobStatusChoices.STATUS_PENDING status = JobStatusChoices.STATUS_SCHEDULED if schedule_at else JobStatusChoices.STATUS_PENDING
job = Job.objects.create( job = Job.objects.create(
object_type=object_type, object_type=object_type,