Content Cache Charm

Merge ~hloeung/content-cache-charm:master into content-cache-charm:master

  1. Git
  2. lp:~hloeung/content-cache-charm
  3. master
  4. Merge into master
Proposed by Haw Loeung
Status: Rejected
Rejected by: Haw Loeung
Proposed branch: ~hloeung/content-cache-charm:master
Merge into: content-cache-charm:master
Diff against target: 165 lines (+13/-13)
12 files modified
lib/nginx.py (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-basic_site.txt (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-site1.local.txt (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-site2.local.txt (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-site3.local.txt (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-site5.txt (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-site6.local.txt (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-site7.local.txt (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-site8.local.txt (+2/-2)
tests/unit/files/nginx_config_rendered_test_output-site9.local.txt (+1/-1)
tests/unit/files/nginx_config_rendered_test_output-token_site.txt (+1/-1)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Content Cache Charmers Pending
Review via email: mp+379277@code.launchpad.net

Commit message

Drop default TTL to something more sensible, 1 hour

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Stuart Bishop (stub) wrote :

Code changes are fine. I'll leave it up to others to state if the TTL default change is sane.

review: Approve

Unmerged commits

85d37e2... by Haw Loeung

Drop default TTL to something more sensible, 1 hour

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/nginx.py b/lib/nginx.py
2index 6752652..3c89aed 100644
3--- a/lib/nginx.py
4+++ b/lib/nginx.py
5@@ -18,7 +18,7 @@ PROXY_CACHE_DEFAULTS = {
6 'min-uses': 1,
7 'revalidate': 'on',
8 'use-stale': 'error timeout updating http_500 http_502 http_503 http_504',
9- 'valid': '200 1d',
10+ 'valid': '200 1h',
11 }
12
13
14diff --git a/tests/unit/files/nginx_config_rendered_test_output-basic_site.txt b/tests/unit/files/nginx_config_rendered_test_output-basic_site.txt
15index 7b2cac5..862827e 100644
16--- a/tests/unit/files/nginx_config_rendered_test_output-basic_site.txt
17+++ b/tests/unit/files/nginx_config_rendered_test_output-basic_site.txt
18@@ -18,7 +18,7 @@ server {
19 proxy_cache_min_uses 1;
20 proxy_cache_revalidate on;
21 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
22- proxy_cache_valid 200 1d;
23+ proxy_cache_valid 200 1h;
24
25 access_by_lua_block {
26 -- Exclude healthchecks from nginx_cache_request_total metric.
27diff --git a/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt b/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt
28index adc4c47..3a8f6de 100644
29--- a/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt
30+++ b/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt
31@@ -18,7 +18,7 @@ server {
32 proxy_cache_min_uses 1;
33 proxy_cache_revalidate on;
34 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
35- proxy_cache_valid 200 1d;
36+ proxy_cache_valid 200 1h;
37 proxy_set_header X-Origin-Key 'Sae6oob2aethuosh';
38
39 access_by_lua_block {
40diff --git a/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt
41index 59ebf86..145b704 100644
42--- a/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt
43+++ b/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt
44@@ -18,7 +18,7 @@ server {
45 proxy_cache_min_uses 1;
46 proxy_cache_revalidate on;
47 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
48- proxy_cache_valid 200 1d;
49+ proxy_cache_valid 200 1h;
50 proxy_set_header X-Origin-Key 'Sae6oob2aethuosh';
51 proxy_set_header X-Some-Header-1 'something one two three';
52 proxy_set_header X-Some-Header-2 'something:one:two:three';
53diff --git a/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
54index 3695d49..d4a7776 100644
55--- a/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
56+++ b/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
57@@ -18,7 +18,7 @@ server {
58 proxy_cache_min_uses 1;
59 proxy_cache_revalidate on;
60 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
61- proxy_cache_valid 200 1d;
62+ proxy_cache_valid 200 1h;
63 }
64
65
66diff --git a/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
67index 32bcd50..7a7f5b7 100644
68--- a/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
69+++ b/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
70@@ -19,7 +19,7 @@ server {
71 proxy_cache_min_uses 1;
72 proxy_cache_revalidate on;
73 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
74- proxy_cache_valid 200 1d;
75+ proxy_cache_valid 200 1h;
76 }
77
78
79diff --git a/tests/unit/files/nginx_config_rendered_test_output-site5.txt b/tests/unit/files/nginx_config_rendered_test_output-site5.txt
80index 8f1cc3d..83d6980 100644
81--- a/tests/unit/files/nginx_config_rendered_test_output-site5.txt
82+++ b/tests/unit/files/nginx_config_rendered_test_output-site5.txt
83@@ -18,7 +18,7 @@ server {
84 proxy_cache_min_uses 1;
85 proxy_cache_revalidate on;
86 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
87- proxy_cache_valid 200 1d;
88+ proxy_cache_valid 200 1h;
89 }
90
91
92diff --git a/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt
93index 2f359c6..483df31 100644
94--- a/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt
95+++ b/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt
96@@ -18,7 +18,7 @@ server {
97 proxy_cache_min_uses 1;
98 proxy_cache_revalidate on;
99 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
100- proxy_cache_valid 200 1d;
101+ proxy_cache_valid 200 1h;
102 }
103
104
105diff --git a/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt
106index a223624..f0cf6c6 100644
107--- a/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt
108+++ b/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt
109@@ -18,7 +18,7 @@ server {
110 proxy_cache_min_uses 1;
111 proxy_cache_revalidate on;
112 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
113- proxy_cache_valid 200 1d;
114+ proxy_cache_valid 200 1h;
115 }
116
117
118diff --git a/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt
119index 986504b..a27d1ec 100644
120--- a/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt
121+++ b/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt
122@@ -18,7 +18,7 @@ server {
123 proxy_cache_min_uses 1;
124 proxy_cache_revalidate on;
125 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
126- proxy_cache_valid 200 1d;
127+ proxy_cache_valid 200 1h;
128 }
129
130
131@@ -33,7 +33,7 @@ server {
132 proxy_cache_min_uses 1;
133 proxy_cache_revalidate on;
134 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
135- proxy_cache_valid 200 1d;
136+ proxy_cache_valid 200 1h;
137 }
138
139
140diff --git a/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt
141index f664e9e..9e9e409 100644
142--- a/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt
143+++ b/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt
144@@ -18,7 +18,7 @@ server {
145 proxy_cache_min_uses 1;
146 proxy_cache_revalidate on;
147 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
148- proxy_cache_valid 200 1d;
149+ proxy_cache_valid 200 1h;
150 }
151
152
153diff --git a/tests/unit/files/nginx_config_rendered_test_output-token_site.txt b/tests/unit/files/nginx_config_rendered_test_output-token_site.txt
154index 94fbf13..087ce94 100644
155--- a/tests/unit/files/nginx_config_rendered_test_output-token_site.txt
156+++ b/tests/unit/files/nginx_config_rendered_test_output-token_site.txt
157@@ -18,7 +18,7 @@ server {
158 proxy_cache_min_uses 1;
159 proxy_cache_revalidate on;
160 proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
161- proxy_cache_valid 200 1d;
162+ proxy_cache_valid 200 1h;
163
164 access_by_lua_block {
165 local hmac_key = "SrRorTsImr92B6FfSKBFrSIiR5NYGS+gdjd8oGoVH44="

Subscribers

People subscribed via source and target branches