From c2d0e8fd9557252e348fe938400de4c5c86f079d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 22 Apr 2019 14:49:31 -0400 Subject: [PATCH] Cleanup from earlier work on caching --- netbox/circuits/views.py | 3 --- netbox/extras/views.py | 2 -- netbox/ipam/views.py | 2 -- netbox/netbox/settings.py | 2 -- netbox/netbox/views.py | 3 --- netbox/secrets/views.py | 5 +---- netbox/tenancy/views.py | 3 --- netbox/utilities/api.py | 6 ------ netbox/utilities/views.py | 2 -- netbox/virtualization/views.py | 3 --- 10 files changed, 1 insertion(+), 30 deletions(-) diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 3aa99c133..219b3d888 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -6,7 +6,6 @@ from django.db import transaction from django.db.models import Count from django.shortcuts import get_object_or_404, redirect, render from django.utils.decorators import method_decorator -from django.views.decorators.cache import cache_page from django.views.generic import View from extras.models import Graph, GRAPH_TYPE_PROVIDER @@ -35,7 +34,6 @@ class ProviderListView(PermissionRequiredMixin, ObjectListView): class ProviderView(PermissionRequiredMixin, View): permission_required = 'circuits.view_provider' - @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, slug): provider = get_object_or_404(Provider, slug=slug) @@ -151,7 +149,6 @@ class CircuitListView(PermissionRequiredMixin, ObjectListView): class CircuitView(PermissionRequiredMixin, View): permission_required = 'circuits.view_circuit' - @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def get(self, request, pk): circuit = get_object_or_404(Circuit.objects.select_related('provider', 'type', 'tenant__group'), pk=pk) diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 005123ffd..21ea4f1c9 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -7,8 +7,6 @@ from django.db.models import Count, Q from django.http import Http404 from django.shortcuts import get_object_or_404, redirect, render from django.utils.safestring import mark_safe -from django.utils.decorators import method_decorator -from django.views.decorators.cache import cache_page from django.views.generic import View from django_tables2 import RequestConfig diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 94a8f7898..d80646bb0 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -3,8 +3,6 @@ from django.conf import settings from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count, Q from django.shortcuts import get_object_or_404, redirect, render -from django.utils.decorators import method_decorator -from django.views.decorators.cache import cache_page from django.views.generic import View from django_tables2 import RequestConfig diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index c05898525..5f8ac3f2b 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -45,8 +45,6 @@ BASE_PATH = getattr(configuration, 'BASE_PATH', '') if BASE_PATH: BASE_PATH = BASE_PATH.strip('/') + '/' # Enforce trailing slash only CACHE_TIMEOUT = getattr(configuration, 'CACHE_TIMEOUT', 900) -CACHE_MAX_ENTRIES = getattr(configuration, 'CACHE_MAX_ENTRIES', 300) -CACHE_CULL_FREQUENCY = getattr(configuration, 'CACHE_CULL_FREQUENCY', 3) CHANGELOG_RETENTION = getattr(configuration, 'CHANGELOG_RETENTION', 90) CORS_ORIGIN_ALLOW_ALL = getattr(configuration, 'CORS_ORIGIN_ALLOW_ALL', False) CORS_ORIGIN_REGEX_WHITELIST = getattr(configuration, 'CORS_ORIGIN_REGEX_WHITELIST', []) diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index e16fd9c49..9d382592d 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -1,10 +1,7 @@ from collections import OrderedDict -from django.conf import settings from django.db.models import Count, F from django.shortcuts import render -from django.utils.decorators import method_decorator -from django.views.decorators.cache import cache_page from django.views.generic import View from rest_framework.response import Response from rest_framework.reverse import reverse diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py index ef4d9351c..b30987935 100644 --- a/netbox/secrets/views.py +++ b/netbox/secrets/views.py @@ -1,14 +1,11 @@ import base64 -from django.conf import settings from django.contrib import messages -from django.contrib.auth.decorators import permission_required, login_required +from django.contrib.auth.decorators import permission_required from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse -from django.utils.decorators import method_decorator -from django.views.decorators.cache import cache_page from django.views.generic import View from dcim.models import Device diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index 1b4c21814..5d43309de 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -1,9 +1,6 @@ -from django.conf import settings from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count from django.shortcuts import get_object_or_404, render -from django.utils.decorators import method_decorator -from django.views.decorators.cache import cache_page from django.views.generic import View from circuits.models import Circuit diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py index f49018242..45c7ace29 100644 --- a/netbox/utilities/api.py +++ b/netbox/utilities/api.py @@ -6,8 +6,6 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import FieldError, MultipleObjectsReturned, ObjectDoesNotExist from django.db.models import ManyToManyField from django.http import Http404 -from django.utils.decorators import method_decorator -from django.views.decorators.cache import cache_page from rest_framework.exceptions import APIException from rest_framework.permissions import BasePermission from rest_framework.relations import PrimaryKeyRelatedField, RelatedField @@ -276,14 +274,12 @@ class ModelViewSet(_ModelViewSet): # Fall back to the hard-coded serializer class return self.serializer_class - @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def list(self, *args, **kwargs): """ Call to super to allow for caching """ return super().list(*args, **kwargs) - @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def retrieve(self, *args, **kwargs): """ Call to super to allow for caching @@ -326,11 +322,9 @@ class FieldChoicesViewSet(ViewSet): }) self._fields[key] = choices - @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def list(self, request): return Response(self._fields) - @method_decorator(cache_page(settings.CACHE_TIMEOUT)) def retrieve(self, request, pk): if pk not in self._fields: raise Http404 diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 06547e802..02441549f 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -17,8 +17,6 @@ from django.urls import reverse from django.utils.html import escape from django.utils.http import is_safe_url from django.utils.safestring import mark_safe -from django.utils.decorators import method_decorator -from django.views.decorators.cache import cache_page from django.views.decorators.csrf import requires_csrf_token from django.views.defaults import ERROR_500_TEMPLATE_NAME from django.views.generic import View diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index c9494132d..712c7acb5 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -1,12 +1,9 @@ -from django.conf import settings from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin from django.db import transaction from django.db.models import Count from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse -from django.utils.decorators import method_decorator -from django.views.decorators.cache import cache_page from django.views.generic import View from dcim.models import Device, Interface