starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-14 13:10:12 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Upgrade to django-rq==4.0.1

Browse Source
This commit is contained in:
Brian Tiemann
2026-03-31 15:48:44 -04:00
parent b8b12f3f90
commit 477bb68ac3
6 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/core/tests/test_views.py
View File

@@ -6,7 +6,7 @@ from datetime import datetime
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from django_rq import get_queue from django_rq import get_queue
from django_rq.settings import QUEUES_MAP from django_rq.settings import get_queues_map
from django_rq.workers import get_worker from django_rq.workers import get_worker
from rq.job import Job as RQ_Job from rq.job import Job as RQ_Job
from rq.job import JobStatus from rq.job import JobStatus
@@ -189,7 +189,7 @@ class BackgroundTaskTestCase(TestCase):
def test_background_tasks_list_default(self): def test_background_tasks_list_default(self):
queue = get_queue('default') queue = get_queue('default')
queue.enqueue(self.dummy_job_default) queue.enqueue(self.dummy_job_default)
queue_index = QUEUES_MAP['default'] queue_index = get_queues_map()['default']
response = self.client.get(reverse('core:background_task_list', args=[queue_index, 'queued'])) response = self.client.get(reverse('core:background_task_list', args=[queue_index, 'queued']))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
@@ -198,7 +198,7 @@ class BackgroundTaskTestCase(TestCase):
def test_background_tasks_list_high(self): def test_background_tasks_list_high(self):
queue = get_queue('high') queue = get_queue('high')
queue.enqueue(self.dummy_job_high) queue.enqueue(self.dummy_job_high)
queue_index = QUEUES_MAP['high'] queue_index = get_queues_map()['high']
response = self.client.get(reverse('core:background_task_list', args=[queue_index, 'queued'])) response = self.client.get(reverse('core:background_task_list', args=[queue_index, 'queued']))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
@@ -207,7 +207,7 @@ class BackgroundTaskTestCase(TestCase):
def test_background_tasks_list_finished(self): def test_background_tasks_list_finished(self):
queue = get_queue('default') queue = get_queue('default')
job = queue.enqueue(self.dummy_job_default) job = queue.enqueue(self.dummy_job_default)
queue_index = QUEUES_MAP['default'] queue_index = get_queues_map()['default']
registry = FinishedJobRegistry(queue.name, queue.connection) registry = FinishedJobRegistry(queue.name, queue.connection)
registry.add(job, 2) registry.add(job, 2)
@@ -218,7 +218,7 @@ class BackgroundTaskTestCase(TestCase):
def test_background_tasks_list_failed(self): def test_background_tasks_list_failed(self):
queue = get_queue('default') queue = get_queue('default')
job = queue.enqueue(self.dummy_job_default) job = queue.enqueue(self.dummy_job_default)
queue_index = QUEUES_MAP['default'] queue_index = get_queues_map()['default']
registry = FailedJobRegistry(queue.name, queue.connection) registry = FailedJobRegistry(queue.name, queue.connection)
registry.add(job, 2) registry.add(job, 2)
@@ -229,7 +229,7 @@ class BackgroundTaskTestCase(TestCase):
def test_background_tasks_scheduled(self): def test_background_tasks_scheduled(self):
queue = get_queue('default') queue = get_queue('default')
queue.enqueue_at(datetime.now(), self.dummy_job_default) queue.enqueue_at(datetime.now(), self.dummy_job_default)
queue_index = QUEUES_MAP['default'] queue_index = get_queues_map()['default']
response = self.client.get(reverse('core:background_task_list', args=[queue_index, 'scheduled'])) response = self.client.get(reverse('core:background_task_list', args=[queue_index, 'scheduled']))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
@@ -238,7 +238,7 @@ class BackgroundTaskTestCase(TestCase):
def test_background_tasks_list_deferred(self): def test_background_tasks_list_deferred(self):
queue = get_queue('default') queue = get_queue('default')
job = queue.enqueue(self.dummy_job_default) job = queue.enqueue(self.dummy_job_default)
queue_index = QUEUES_MAP['default'] queue_index = get_queues_map()['default']
registry = DeferredJobRegistry(queue.name, queue.connection) registry = DeferredJobRegistry(queue.name, queue.connection)
registry.add(job, 2) registry.add(job, 2)
@@ -335,7 +335,7 @@ class BackgroundTaskTestCase(TestCase):
worker2 = get_worker('high') worker2 = get_worker('high')
worker2.register_birth() worker2.register_birth()
queue_index = QUEUES_MAP['default'] queue_index = get_queues_map()['default']
response = self.client.get(reverse('core:worker_list', args=[queue_index])) response = self.client.get(reverse('core:worker_list', args=[queue_index]))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertIn(str(worker1.name), str(response.content)) self.assertIn(str(worker1.name), str(response.content))

10
netbox/core/utils.py
View File

@@ -1,7 +1,7 @@
from django.http import Http404 from django.http import Http404
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django_rq.queues import get_queue, get_queue_by_index, get_redis_connection from django_rq.queues import get_queue, get_queue_by_index, get_redis_connection
from django_rq.settings import QUEUES_LIST, QUEUES_MAP from django_rq.settings import QUEUES_LIST, get_queues_map
from django_rq.utils import get_jobs, stop_jobs from django_rq.utils import get_jobs, stop_jobs
from rq import requeue_job from rq import requeue_job
from rq.exceptions import NoSuchJobError from rq.exceptions import NoSuchJobError
@@ -84,7 +84,7 @@ def delete_rq_job(job_id):
except NoSuchJobError: except NoSuchJobError:
raise Http404(_("Job {job_id} not found").format(job_id=job_id)) raise Http404(_("Job {job_id} not found").format(job_id=job_id))
queue_index = QUEUES_MAP[job.origin] queue_index = get_queues_map()[job.origin]
queue = get_queue_by_index(queue_index) queue = get_queue_by_index(queue_index)
# Remove job id from queue and delete the actual job # Remove job id from queue and delete the actual job
@@ -102,7 +102,7 @@ def requeue_rq_job(job_id):
except NoSuchJobError: except NoSuchJobError:
raise Http404(_("Job {id} not found.").format(id=job_id)) raise Http404(_("Job {id} not found.").format(id=job_id))
queue_index = QUEUES_MAP[job.origin] queue_index = get_queues_map()[job.origin]
queue = get_queue_by_index(queue_index) queue = get_queue_by_index(queue_index)
requeue_job(job_id, connection=queue.connection, serializer=queue.serializer) requeue_job(job_id, connection=queue.connection, serializer=queue.serializer)
@@ -118,7 +118,7 @@ def enqueue_rq_job(job_id):
except NoSuchJobError: except NoSuchJobError:
raise Http404(_("Job {id} not found.").format(id=job_id)) raise Http404(_("Job {id} not found.").format(id=job_id))
queue_index = QUEUES_MAP[job.origin] queue_index = get_queues_map()[job.origin]
queue = get_queue_by_index(queue_index) queue = get_queue_by_index(queue_index)
try: try:
@@ -150,7 +150,7 @@ def stop_rq_job(job_id):
except NoSuchJobError: except NoSuchJobError:
raise Http404(_("Job {job_id} not found").format(job_id=job_id)) raise Http404(_("Job {job_id} not found").format(job_id=job_id))
queue_index = QUEUES_MAP[job.origin] queue_index = get_queues_map()[job.origin]
queue = get_queue_by_index(queue_index) queue = get_queue_by_index(queue_index)
return stop_jobs(queue, job_id)[0] return stop_jobs(queue, job_id)[0]

4
netbox/core/views.py
View File

@@ -14,7 +14,7 @@ from django.urls import reverse
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.views.generic import View from django.views.generic import View
from django_rq.queues import get_connection, get_queue_by_index, get_redis_connection from django_rq.queues import get_connection, get_queue_by_index, get_redis_connection
from django_rq.settings import QUEUES_LIST, QUEUES_MAP from django_rq.settings import QUEUES_LIST, get_queues_map
from django_rq.utils import get_statistics from django_rq.utils import get_statistics
from rq.exceptions import NoSuchJobError from rq.exceptions import NoSuchJobError
from rq.job import Job as RQ_Job from rq.job import Job as RQ_Job
@@ -530,7 +530,7 @@ class BackgroundTaskView(BaseRQView):
except NoSuchJobError: except NoSuchJobError:
raise Http404(_("Job {job_id} not found").format(job_id=job_id)) raise Http404(_("Job {job_id} not found").format(job_id=job_id))
queue_index = QUEUES_MAP[job.origin] queue_index = get_queues_map()[job.origin]
queue = get_queue_by_index(queue_index) queue = get_queue_by_index(queue_index)
try: try:

4
netbox/netbox/configuration_testing.py
View File

@@ -20,6 +20,10 @@ PLUGINS = [
'netbox.tests.dummy_plugin', 'netbox.tests.dummy_plugin',
] ]
RQ = {
'COMMIT_MODE': 'auto',
}
REDIS = { REDIS = {
'tasks': { 'tasks': {
'HOST': 'localhost', 'HOST': 'localhost',

1
netbox/netbox/settings.py
View File

@@ -168,6 +168,7 @@ REMOTE_AUTH_USER_FIRST_NAME = getattr(configuration, 'REMOTE_AUTH_USER_FIRST_NAM
REMOTE_AUTH_USER_LAST_NAME = getattr(configuration, 'REMOTE_AUTH_USER_LAST_NAME', 'HTTP_REMOTE_USER_LAST_NAME') REMOTE_AUTH_USER_LAST_NAME = getattr(configuration, 'REMOTE_AUTH_USER_LAST_NAME', 'HTTP_REMOTE_USER_LAST_NAME')
# Required by extras/migrations/0109_script_models.py # Required by extras/migrations/0109_script_models.py
REPORTS_ROOT = getattr(configuration, 'REPORTS_ROOT', os.path.join(BASE_DIR, 'reports')).rstrip('/') REPORTS_ROOT = getattr(configuration, 'REPORTS_ROOT', os.path.join(BASE_DIR, 'reports')).rstrip('/')
RQ = getattr(configuration, 'RQ', {})
RQ_DEFAULT_TIMEOUT = getattr(configuration, 'RQ_DEFAULT_TIMEOUT', 300) RQ_DEFAULT_TIMEOUT = getattr(configuration, 'RQ_DEFAULT_TIMEOUT', 300)
RQ_RETRY_INTERVAL = getattr(configuration, 'RQ_RETRY_INTERVAL', 60) RQ_RETRY_INTERVAL = getattr(configuration, 'RQ_RETRY_INTERVAL', 60)
RQ_RETRY_MAX = getattr(configuration, 'RQ_RETRY_MAX', 0) RQ_RETRY_MAX = getattr(configuration, 'RQ_RETRY_MAX', 0)

2
requirements.txt
View File

@@ -10,7 +10,7 @@ django-pglocks==1.0.4
django-prometheus==2.4.1 django-prometheus==2.4.1
django-redis==6.0.0 django-redis==6.0.0
django-rich==2.2.0 django-rich==2.2.0
django-rq==3.2.2 django-rq==4.0.1
django-storages==1.14.6 django-storages==1.14.6
django-tables2==2.8.0 django-tables2==2.8.0
django-taggit==6.1.0 django-taggit==6.1.0