Merge pull request #113 from glogiotatidis/cachebundles

Cache bundles for a month.
mozmeao · May 27, 2015 · cc7c93a · cc7c93a
2 parents 0455901 + 9c28132
commit cc7c93a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/media/bundles/.htaccess b/media/bundles/.htaccess
@@ -0,0 +1,4 @@
+ExpiresActive on
+ExpiresDefault "access plus 1 month"
+FileETag MTime
+Header set Access-Control-Allow-Origin "*"
diff --git a/snippets/base/models.py b/snippets/base/models.py
@@ -107,7 +107,8 @@ def key(self):
         # Key should consist of snippets that are in the bundle plus any
         # properties of the client that may change the snippet code
         # being sent.
-        key_properties = [snippet.id for snippet in self.snippets]
+        key_properties = ['{id}-{date}'.format(id=snippet.id, date=snippet.modified.isoformat())
+                          for snippet in self.snippets]
         key_properties.extend([
             self.client.startpage_version,
             self.client.locale,