Decreased the default cache TTL

wikimedia · Oct 25, 2016 · d316fbc · d316fbc
1 parent c1c6704
commit d316fbc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/config.example.wikimedia.yaml b/config.example.wikimedia.yaml
@@ -32,6 +32,8 @@ default_project: &default_project
           cache_control: s-maxage=86400, max-age=86400
         # 10 days Varnish caching, one day client-side
         purged_cache_control: s-maxage=864000, max-age=86400
+        # Cache PDF for 5 minutes since it's not purged
+        pdf_cache_control: s-maxage=300, max-age=300
         skip_updates: false
 
 # A different project template, sharing configuration options.

diff --git a/projects/wmf_default.yaml b/projects/wmf_default.yaml
@@ -55,7 +55,7 @@ paths:
                                 options.mobileapps)}}'
                 - path: v1/pdf.yaml
                   options:
-                    response_cache_control: '{{options.purged_cache_control}}'
+                    response_cache_control: '{{options.pdf_cache_control}}'
             /feed:
               x-modules:
                 - path: v1/feed.js

diff --git a/projects/wmf_wiktionary.yaml b/projects/wmf_wiktionary.yaml
@@ -51,7 +51,7 @@ paths:
                     host: '{{options.mobileapps.host}}'
                 - path: v1/pdf.yaml
                   options:
-                    response_cache_control: '{{options.purged_cache_control}}'
+                    response_cache_control: '{{options.pdf_cache_control}}'
             /transform:
               x-modules:
                 - path: v1/transform.yaml

diff --git a/v1/pdf.yaml b/v1/pdf.yaml
@@ -65,7 +65,7 @@ paths:
                 content-disposition: 'attachment; filename={{request.params.title}}.pdf'
                 content-type: '{{get_pdf_from_backend.headers.content-type}}'
                 content-length: '{{get_pdf_from_backend.headers.content-length}}'
-                cache-control: '{{options.response_cache_control}}'
+                cache-control: '{{default(options.response_cache_control, "s-maxage=300, max-age=300")}}'
               body: '{{get_pdf_from_backend.body}}'
 
 definitions: