Merge pull request #182 from springload/fix/cache

Make cache lifetime and invalidation work properly together

Author: haydngreatnews

madewithwagtail/settings/grains/cache.py

@@ -1,11 +1,8 @@
-import django_cache_url
-
 from madewithwagtail.settings import ENVIRONMENT, PROJECT  # , CACHE_URL
 
+
 __all__ = [
     "CACHES",
-    "CACHALOT_TIMEOUT",
-    "WAGTAILFRONTENDCACHE",
 ]  # don't import DEV_CACHES by default
 
 # Dont use redis because we don't need it
@@ -26,17 +23,3 @@
 
 # Add a prefix to distinguish huey entries and app entries
 CACHES.get("default").update({"PREFIX": "-".join([PROJECT, ENVIRONMENT])})
-
-# When this isn't set, it will eventually fill up redis
-CACHALOT_TIMEOUT = 300
-
-# For frontend cache module
-WAGTAILFRONTENDCACHE = {
-    "cloudfront": {
-        "BACKEND": "wagtail.contrib.frontend_cache.backends.CloudfrontBackend",
-        "DISTRIBUTION_ID": {
-            # TODO change this when do the DNS changeover to madewithwagtail.org
-            "madewithwagtail-preview-media.s3-website-ap-southeast-2.amazonaws.com": "E19LUSH371PZQA",
-        },
-    }
-}

madewithwagtail/settings/hosting.py

@@ -4,6 +4,12 @@
 from .grains.logging import LOGGING
 from .grains.sentry import *
 
+from typed_environment_configuration import StringVariable
+
+AWS_CONTENT_DISTRIBUTION_ID = StringVariable(
+    "AWS_CONTENT_DISTRIBUTION_ID", default=""
+).getenv()
+
 # Google Analytics settings
 GOOGLE_TAG_MANAGER = False
 
@@ -31,11 +37,19 @@
 TASKS_RETRY_DELAY = 5 * 60  # 5 minutes delay
 
 
-CACHE_MIDDLEWARE_SECONDS = 86400  # 24 hours
-CACHE_TEMPLATE_FRAGMENTS_SECONDS = 86400  # 24 hours
+CACHE_MIDDLEWARE_SECONDS = 600
+CACHE_TEMPLATE_FRAGMENTS_SECONDS = 600
 
 # Make sure we include the needed Middleware apps
 # Excluding logged in (admin) requests
 CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
 
 SECURE_HSTS_SECONDS = 31536000
+
+# For frontend cache module
+WAGTAILFRONTENDCACHE = {
+    "cloudfront": {
+        "BACKEND": "wagtail.contrib.frontend_cache.backends.CloudfrontBackend",
+        "DISTRIBUTION_ID": AWS_CONTENT_DISTRIBUTION_ID,
+    }
+}