From 91480299ecbc26d49a7596d702605eeb972b40ac Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 27 Oct 2023 14:58:56 -0700 Subject: [PATCH] 14132 flush_webhooks -> flush_events --- netbox/extras/context_managers.py | 4 ++-- netbox/extras/tests/test_webhooks.py | 4 ++-- netbox/extras/webhooks.py | 2 +- netbox/netbox/settings.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netbox/extras/context_managers.py b/netbox/extras/context_managers.py index e0af2742a..c3c78f98b 100644 --- a/netbox/extras/context_managers.py +++ b/netbox/extras/context_managers.py @@ -1,7 +1,7 @@ from contextlib import contextmanager from netbox.context import current_request, events_queue -from .webhooks import flush_webhooks +from .webhooks import flush_events @contextmanager @@ -18,7 +18,7 @@ def event_wrapper(request): yield # Flush queued webhooks to RQ - flush_webhooks(events_queue.get()) + flush_events(events_queue.get()) # Clear context vars current_request.set(None) diff --git a/netbox/extras/tests/test_webhooks.py b/netbox/extras/tests/test_webhooks.py index e8cc51b8e..c30925081 100644 --- a/netbox/extras/tests/test_webhooks.py +++ b/netbox/extras/tests/test_webhooks.py @@ -13,7 +13,7 @@ from dcim.choices import SiteStatusChoices from dcim.models import Site from extras.choices import ObjectChangeActionChoices from extras.models import Tag, Webhook -from extras.webhooks import enqueue_object, flush_webhooks, generate_signature, serialize_for_webhook +from extras.webhooks import enqueue_object, flush_events, generate_signature, serialize_for_webhook from extras.webhooks_worker import eval_conditions, process_webhook from utilities.testing import APITestCase @@ -322,7 +322,7 @@ class WebhookTest(APITestCase): request_id=request_id, action=ObjectChangeActionChoices.ACTION_CREATE ) - flush_webhooks(events_queue) + flush_events(events_queue) # Retrieve the job from queue job = self.queue.jobs[0] diff --git a/netbox/extras/webhooks.py b/netbox/extras/webhooks.py index 1fc869ee8..2dc474e8a 100644 --- a/netbox/extras/webhooks.py +++ b/netbox/extras/webhooks.py @@ -77,7 +77,7 @@ def enqueue_object(queue, instance, user, request_id, action): }) -def flush_webhooks(queue): +def flush_events(queue): """ Flush a list of object representation to RQ for webhook processing. """ diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 4c8b3f960..36f56b0f6 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -671,7 +671,7 @@ GRAPHENE = { # -# Django RQ (Webhooks backend) +# Django RQ (events backend) # if TASKS_REDIS_USING_SENTINEL: