Commit 98133501 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

New FetchFromCacheMiddleware

parent b83b3c9d
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import resolve
from django.utils import translation
from django.utils.cache import add_never_cache_headers
from django.middleware.cache import FetchFromCacheMiddleware as DjangoFetchFromCacheMiddleware

#from opds_catalog import settings
from constance import config
@@ -59,9 +60,15 @@ class SOPDSLocaleMiddleware:
            translation.activate(request.LANG)
            request.LANGUAGE_CODE = request.LANG

class DisableAnonymouseCachingMiddleware:
class FetchFromCacheMiddleware(DjangoFetchFromCacheMiddleware):

    def process_response(self, request, response):
#    def process_response(self, request, response):
#        if not request.user.is_authenticated():
#            add_never_cache_headers(response)
#        return response

    def process_request(self, request):
        if not request.user.is_authenticated():
            add_never_cache_headers(response)
        return response
 No newline at end of file
            return None
        else:
            return super(FetchFromCacheMiddleware, self).process_request(request)
 No newline at end of file
+3 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ INSTALLED_APPS = [
]

MIDDLEWARE_CLASSES = [
    'django.middleware.cache.UpdateCacheMiddleware',
    'django.middleware.security.SecurityMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
    'django.middleware.common.CommonMiddleware',
@@ -54,8 +55,8 @@ MIDDLEWARE_CLASSES = [
    'opds_catalog.middleware.SOPDSLocaleMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
    'django.middleware.cache.CacheMiddleware',
    'opds_catalog.middleware.DisableAnonymouseCachingMiddleware',
    #'django.middleware.cache.CacheMiddleware',
    'opds_catalog.middleware.FetchFromCacheMiddleware',
]

ROOT_URLCONF = 'sopds.urls'