NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Move housekeeping to _handle_changed_object()

Browse Source
This commit is contained in:
Jeremy Stretch 2020-08-18 09:03:17 -04:00
parent 0e5d0a43f9
commit afebf525d1
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/extras/middleware.py
View File

@ -48,12 +48,3 @@ class ObjectChangeMiddleware(object):
pre_delete.disconnect(handle_deleted_object, dispatch_uid='handle_deleted_object') pre_delete.disconnect(handle_deleted_object, dispatch_uid='handle_deleted_object')
return response return response
# TODO: Put this somewhere
# # Housekeeping: 1% chance of clearing out expired ObjectChanges. This applies only to requests which result in
# # one or more changes being logged.
# if settings.CHANGELOG_RETENTION and random.randint(1, 100) == 1:
# cutoff = timezone.now() - timedelta(days=settings.CHANGELOG_RETENTION)
# purged_count, _ = ObjectChange.objects.filter(
# time__lt=cutoff
# ).delete()

11
netbox/extras/signals.py
View File

@ -1,8 +1,14 @@
import random
from datetime import timedelta
from cacheops.signals import cache_invalidated, cache_read from cacheops.signals import cache_invalidated, cache_read
from django.conf import settings
from django.utils import timezone
from django_prometheus.models import model_deletes, model_inserts, model_updates from django_prometheus.models import model_deletes, model_inserts, model_updates
from prometheus_client import Counter from prometheus_client import Counter
from .choices import ObjectChangeActionChoices from .choices import ObjectChangeActionChoices
from .models import ObjectChange
from .webhooks import enqueue_webhooks from .webhooks import enqueue_webhooks
@ -41,6 +47,11 @@ def _handle_changed_object(request, sender, instance, **kwargs):
elif action == ObjectChangeActionChoices.ACTION_UPDATE: elif action == ObjectChangeActionChoices.ACTION_UPDATE:
model_updates.labels(instance._meta.model_name).inc() model_updates.labels(instance._meta.model_name).inc()
# Housekeeping: 0.1% chance of clearing out expired ObjectChanges
if settings.CHANGELOG_RETENTION and random.randint(1, 1000) == 1:
cutoff = timezone.now() - timedelta(days=settings.CHANGELOG_RETENTION)
ObjectChange.objects.filter(time__lt=cutoff).delete()
def _handle_deleted_object(request, sender, instance, **kwargs): def _handle_deleted_object(request, sender, instance, **kwargs):
""" """