Adjust page and content caching lengths and decorators

Remove never_cache from many places now that we don't actually need it
since we aren't caching by default. Adjust our cache_function decorator
times be shorter values, and also randomize them a bit to make cache
invalidations not all line up.

Signed-off-by: Dan McGee <dan@archlinux.org>

3 files changed, 2 insertions, 6 deletions

diff --git a/packages/utils.py b/packages/utils.py
index d4a9d8f6..2a43a08b 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -11,7 +11,7 @@ from main.utils import cache_function, groupby_preserve_order, PackageStandin
 from .models import (PackageGroup, PackageRelation,
         SignoffSpecification, Signoff, DEFAULT_SIGNOFF_SPEC)
 
-@cache_function(300)
+@cache_function(127)
 def get_group_info(include_arches=None):
     raw_groups = PackageGroup.objects.values_list(
             'name', 'pkg__arch__name').order_by('name').annotate(
@@ -92,7 +92,7 @@ class Difference(object):
         return False
 
 
-@cache_function(300)
+@cache_function(127)
 def get_differences_info(arch_a, arch_b):
     # This is a monster. Join packages against itself, looking for packages in
     # our non-'any' architectures only, and not having a corresponding package
diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index 9f24056a..5be4833e 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -5,7 +5,6 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.http import HttpResponse, Http404
 from django.shortcuts import get_object_or_404, redirect
 from django.utils import simplejson
-from django.views.decorators.cache import never_cache
 from django.views.decorators.http import require_POST
 from django.views.decorators.vary import vary_on_headers
 from django.views.generic.simple import direct_to_template
@@ -247,7 +246,6 @@ def arch_differences(request):
     return direct_to_template(request, 'packages/differences.html', context)
 
 @permission_required('main.change_package')
-@never_cache
 def stale_relations(request):
     relations = PackageRelation.objects.select_related('user')
     pkgbases = Package.objects.all().values('pkgbase')
diff --git a/packages/views/signoff.py b/packages/views/signoff.py
index e57b4d9a..e3daf0dd 100644
--- a/packages/views/signoff.py
+++ b/packages/views/signoff.py
@@ -18,7 +18,6 @@ from ..utils import (get_signoff_groups, approved_by_signoffs,
         PackageSignoffGroup)
 
 @permission_required('main.change_package')
-@never_cache
 def signoffs(request):
     signoff_groups = sorted(get_signoff_groups(), key=attrgetter('pkgbase'))
     for group in signoff_groups:
@@ -178,7 +177,6 @@ class SignoffJSONEncoder(DjangoJSONEncoder):
         return super(SignoffJSONEncoder, self).default(obj)
 
 @permission_required('main.change_package')
-@never_cache
 def signoffs_json(request):
     signoff_groups = sorted(get_signoff_groups(), key=attrgetter('pkgbase'))
     data = {