|
|
@@ -7,13 +7,14 @@ from django.dispatch import receiver, Signal
|
|
|
from django_prometheus.models import model_deletes, model_inserts, model_updates
|
|
|
|
|
|
from extras.validators import CustomValidator
|
|
|
+from netbox import thread_locals
|
|
|
from netbox.config import get_config
|
|
|
+from netbox.request_context import get_request
|
|
|
from netbox.signals import post_clean
|
|
|
from .choices import ObjectChangeActionChoices
|
|
|
from .models import ConfigRevision, CustomField, ObjectChange
|
|
|
from .webhooks import enqueue_object, get_snapshots, serialize_for_webhook
|
|
|
|
|
|
-
|
|
|
#
|
|
|
# Change logging/webhooks
|
|
|
#
|
|
|
@@ -22,10 +23,16 @@ from .webhooks import enqueue_object, get_snapshots, serialize_for_webhook
|
|
|
clear_webhooks = Signal()
|
|
|
|
|
|
|
|
|
-def _handle_changed_object(request, webhook_queue, sender, instance, **kwargs):
|
|
|
+def handle_changed_object(sender, instance, **kwargs):
|
|
|
"""
|
|
|
Fires when an object is created or updated.
|
|
|
"""
|
|
|
+ if not hasattr(instance, 'to_objectchange'):
|
|
|
+ return
|
|
|
+
|
|
|
+ request = get_request()
|
|
|
+ m2m_changed = False
|
|
|
+
|
|
|
def is_same_object(instance, webhook_data):
|
|
|
return (
|
|
|
ContentType.objects.get_for_model(instance) == webhook_data['content_type'] and
|
|
|
@@ -33,11 +40,6 @@ def _handle_changed_object(request, webhook_queue, sender, instance, **kwargs):
|
|
|
request.id == webhook_data['request_id']
|
|
|
)
|
|
|
|
|
|
- if not hasattr(instance, 'to_objectchange'):
|
|
|
- return
|
|
|
-
|
|
|
- m2m_changed = False
|
|
|
-
|
|
|
# Determine the type of change being made
|
|
|
if kwargs.get('created'):
|
|
|
action = ObjectChangeActionChoices.ACTION_CREATE
|
|
|
@@ -67,6 +69,7 @@ def _handle_changed_object(request, webhook_queue, sender, instance, **kwargs):
|
|
|
objectchange.save()
|
|
|
|
|
|
# If this is an M2M change, update the previously queued webhook (from post_save)
|
|
|
+ webhook_queue = thread_locals.webhook_queue
|
|
|
if m2m_changed and webhook_queue and is_same_object(instance, webhook_queue[-1]):
|
|
|
instance.refresh_from_db() # Ensure that we're working with fresh M2M assignments
|
|
|
webhook_queue[-1]['data'] = serialize_for_webhook(instance)
|
|
|
@@ -81,13 +84,15 @@ def _handle_changed_object(request, webhook_queue, sender, instance, **kwargs):
|
|
|
model_updates.labels(instance._meta.model_name).inc()
|
|
|
|
|
|
|
|
|
-def _handle_deleted_object(request, webhook_queue, sender, instance, **kwargs):
|
|
|
+def handle_deleted_object(sender, instance, **kwargs):
|
|
|
"""
|
|
|
Fires when an object is deleted.
|
|
|
"""
|
|
|
if not hasattr(instance, 'to_objectchange'):
|
|
|
return
|
|
|
|
|
|
+ request = get_request()
|
|
|
+
|
|
|
# Record an ObjectChange if applicable
|
|
|
if hasattr(instance, 'to_objectchange'):
|
|
|
objectchange = instance.to_objectchange(ObjectChangeActionChoices.ACTION_DELETE)
|
|
|
@@ -96,19 +101,21 @@ def _handle_deleted_object(request, webhook_queue, sender, instance, **kwargs):
|
|
|
objectchange.save()
|
|
|
|
|
|
# Enqueue webhooks
|
|
|
+ webhook_queue = thread_locals.webhook_queue
|
|
|
enqueue_object(webhook_queue, instance, request.user, request.id, ObjectChangeActionChoices.ACTION_DELETE)
|
|
|
|
|
|
# Increment metric counters
|
|
|
model_deletes.labels(instance._meta.model_name).inc()
|
|
|
|
|
|
|
|
|
-def _clear_webhook_queue(webhook_queue, sender, **kwargs):
|
|
|
+def clear_webhook_queue(sender, **kwargs):
|
|
|
"""
|
|
|
Delete any queued webhooks (e.g. because of an aborted bulk transaction)
|
|
|
"""
|
|
|
logger = logging.getLogger('webhooks')
|
|
|
- logger.info(f"Clearing {len(webhook_queue)} queued webhooks ({sender})")
|
|
|
+ webhook_queue = thread_locals.webhook_queue
|
|
|
|
|
|
+ logger.info(f"Clearing {len(webhook_queue)} queued webhooks ({sender})")
|
|
|
webhook_queue.clear()
|
|
|
|
|
|
|
jeremystretch