|
@@ -1,8 +1,6 @@
|
|
-from django.core.cache import cache
|
|
|
|
from django.utils.functional import SimpleLazyObject
|
|
from django.utils.functional import SimpleLazyObject
|
|
|
|
|
|
-from . import CACHE_NAME
|
|
|
|
-from .models import CacheVersion
|
|
|
|
|
|
+from .versions import get_cache_versions
|
|
|
|
|
|
|
|
|
|
def cache_versions_middleware(get_response):
|
|
def cache_versions_middleware(get_response):
|
|
@@ -12,20 +10,3 @@ def cache_versions_middleware(get_response):
|
|
return get_response(request)
|
|
return get_response(request)
|
|
|
|
|
|
return middleware
|
|
return middleware
|
|
-
|
|
|
|
-
|
|
|
|
-def get_cache_versions():
|
|
|
|
- cache_versions = get_cache_versions_from_cache()
|
|
|
|
- if cache_versions is None:
|
|
|
|
- cache_versions = get_cache_versions_from_db()
|
|
|
|
- cache.set(CACHE_NAME, cache_versions)
|
|
|
|
- return cache_versions
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-def get_cache_versions_from_cache():
|
|
|
|
- return cache.get(CACHE_NAME)
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-def get_cache_versions_from_db():
|
|
|
|
- queryset = CacheVersion.objects.all()
|
|
|
|
- return {i.cache: i.version for i in queryset}
|
|
|