From d316fbcefb6e39c7c28acc3cf3739cd1f1d0a6d8 Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Tue, 25 Oct 2016 12:28:03 -0700 Subject: [PATCH] Decreased the default cache TTL --- config.example.wikimedia.yaml | 2 ++ projects/wmf_default.yaml | 2 +- projects/wmf_wiktionary.yaml | 2 +- v1/pdf.yaml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config.example.wikimedia.yaml b/config.example.wikimedia.yaml index 0c984f914..19ae3570e 100644 --- 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 index a7ee1adee..433481bdd 100644 --- 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 index 520111a4f..2dbfa9ddc 100644 --- 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 index 5b8d637e1..ae3da5a00 100644 --- 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: