Merge ~hloeung/content-cache-charm:cleanup into content-cache-charm:master
- Git
- lp:~hloeung/content-cache-charm
- cleanup
- Merge into master
Proposed by
Haw Loeung
| Status: | Merged |
|---|---|
| Approved by: | Paul Collins |
| Approved revision: | 2b3f15b2359e390d6d86ae0c790fbb14c15fd15d |
| Merged at revision: | 9e1d668e53ff85b458917fc955774f2ab45fcd0e |
| Proposed branch: | ~hloeung/content-cache-charm:cleanup |
| Merge into: | content-cache-charm:master |
| Diff against target: |
496 lines (+53/-51) 11 files modified
files/nginx-logging-format.conf (+1/-1) reactive/content_cache.py (+3/-1) tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+9/-9) tests/unit/files/content_cache_rendered_haproxy_test_output2.txt (+1/-1) tests/unit/files/content_cache_rendered_haproxy_test_output3.txt (+1/-1) tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt (+9/-9) tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt (+1/-1) tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt (+9/-9) tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt (+9/-9) tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt (+9/-9) tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt (+1/-1) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paul Collins | lgtm | Approve | |
| Canonical IS Reviewers | Pending | ||
|
Review via email:
|
|||
Commit message
Back to X-Forwarded-For as some things expect it to be this (e.g. Moin
Description of the change
To post a comment you must log in.
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : | # |
Revision history for this message
| Paul Collins (pjdc) : | # |
review:
Approve
(lgtm)
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : | # |
Change successfully merged at revision 9e1d668e53ff85b
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | diff --git a/files/nginx-logging-format.conf b/files/nginx-logging-format.conf | |||
| 2 | index b9df464..a646743 100644 | |||
| 3 | --- a/files/nginx-logging-format.conf | |||
| 4 | +++ b/files/nginx-logging-format.conf | |||
| 5 | @@ -1,4 +1,4 @@ | |||
| 7 | 1 | log_format content_cache '$http_x_cache_request_ip - $remote_user [$time_local] ' | 1 | log_format content_cache '$http_x_forwarded_for - $remote_user [$time_local] ' |
| 8 | 2 | '"$request" $status $bytes_sent ' | 2 | '"$request" $status $bytes_sent ' |
| 9 | 3 | '"$http_referer" "$http_user_agent" $request_time ' | 3 | '"$http_referer" "$http_user_agent" $request_time ' |
| 10 | 4 | '$upstream_cache_status $upstream_response_time ' | 4 | '$upstream_cache_status $upstream_response_time ' |
| 11 | diff --git a/reactive/content_cache.py b/reactive/content_cache.py | |||
| 12 | index 9f95727..a215f62 100644 | |||
| 13 | --- a/reactive/content_cache.py | |||
| 14 | +++ b/reactive/content_cache.py | |||
| 15 | @@ -281,7 +281,9 @@ def configure_haproxy(): # NOQA: C901 LP#1825084 | |||
| 16 | 281 | # Also, for caching layer, we want higher fall count as it's less | 281 | # Also, for caching layer, we want higher fall count as it's less |
| 17 | 282 | # likely the caching layer is down, 2 mins here (inter * fall). | 282 | # likely the caching layer is down, 2 mins here (inter * fall). |
| 18 | 283 | new_cached_loc_conf['backend-fall-count'] = 60 | 283 | new_cached_loc_conf['backend-fall-count'] = 60 |
| 20 | 284 | new_cached_loc_conf['backend-options'] = ['http-request set-header X-Cache-Request-IP %[src]'] | 284 | # Rather than enable haproxy's 'option forwardfor' we want to replace |
| 21 | 285 | # the X-F-F header in case it's spoofed. | ||
| 22 | 286 | new_cached_loc_conf['backend-options'] = ['http-request set-header X-Forwarded-For %[src]'] | ||
| 23 | 285 | 287 | ||
| 24 | 286 | # No backends | 288 | # No backends |
| 25 | 287 | if not site_conf['locations'][location].get('backends'): | 289 | if not site_conf['locations'][location].get('backends'): |
| 26 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt | |||
| 27 | index 658b0d1..b7bb481 100644 | |||
| 28 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt | |||
| 29 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt | |||
| 30 | @@ -157,7 +157,7 @@ listen site9-local | |||
| 31 | 157 | backend backend-cached-site1-local | 157 | backend backend-cached-site1-local |
| 32 | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk |
| 33 | 159 | http-request set-header Host site1.local | 159 | http-request set-header Host site1.local |
| 35 | 160 | http-request set-header X-Cache-Request-IP %[src] | 160 | http-request set-header X-Forwarded-For %[src] |
| 36 | 161 | balance leastconn | 161 | balance leastconn |
| 37 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
| 38 | 163 | 163 | ||
| 39 | @@ -173,7 +173,7 @@ backend backend-site1-local | |||
| 40 | 173 | backend backend-cached-site2-local | 173 | backend backend-cached-site2-local |
| 41 | 174 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | 174 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk |
| 42 | 175 | http-request set-header Host site2.local | 175 | http-request set-header Host site2.local |
| 44 | 176 | http-request set-header X-Cache-Request-IP %[src] | 176 | http-request set-header X-Forwarded-For %[src] |
| 45 | 177 | balance leastconn | 177 | balance leastconn |
| 46 | 178 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 178 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
| 47 | 179 | 179 | ||
| 48 | @@ -189,7 +189,7 @@ backend backend-site2-local | |||
| 49 | 189 | backend backend-cached-site3-local | 189 | backend backend-cached-site3-local |
| 50 | 190 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | 190 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk |
| 51 | 191 | http-request set-header Host site3.local | 191 | http-request set-header Host site3.local |
| 53 | 192 | http-request set-header X-Cache-Request-IP %[src] | 192 | http-request set-header X-Forwarded-For %[src] |
| 54 | 193 | balance leastconn | 193 | balance leastconn |
| 55 | 194 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 194 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
| 56 | 195 | 195 | ||
| 57 | @@ -207,14 +207,14 @@ backend backend-site3-local | |||
| 58 | 207 | backend backend-cached-site4-local | 207 | backend backend-cached-site4-local |
| 59 | 208 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | 208 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk |
| 60 | 209 | http-request set-header Host site4.local | 209 | http-request set-header Host site4.local |
| 62 | 210 | http-request set-header X-Cache-Request-IP %[src] | 210 | http-request set-header X-Forwarded-For %[src] |
| 63 | 211 | balance leastconn | 211 | balance leastconn |
| 64 | 212 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 212 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
| 65 | 213 | 213 | ||
| 66 | 214 | backend backend-cached-site5 | 214 | backend backend-cached-site5 |
| 67 | 215 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | 215 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk |
| 68 | 216 | http-request set-header Host site5.local | 216 | http-request set-header Host site5.local |
| 70 | 217 | http-request set-header X-Cache-Request-IP %[src] | 217 | http-request set-header X-Forwarded-For %[src] |
| 71 | 218 | balance leastconn | 218 | balance leastconn |
| 72 | 219 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 219 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
| 73 | 220 | 220 | ||
| 74 | @@ -235,7 +235,7 @@ backend backend-site5-2 | |||
| 75 | 235 | backend backend-cached-site6-local | 235 | backend backend-cached-site6-local |
| 76 | 236 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | 236 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk |
| 77 | 237 | http-request set-header Host site6.local | 237 | http-request set-header Host site6.local |
| 79 | 238 | http-request set-header X-Cache-Request-IP %[src] | 238 | http-request set-header X-Forwarded-For %[src] |
| 80 | 239 | balance leastconn | 239 | balance leastconn |
| 81 | 240 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 240 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
| 82 | 241 | 241 | ||
| 83 | @@ -249,7 +249,7 @@ backend backend-site6-local | |||
| 84 | 249 | backend backend-cached-site7-local | 249 | backend backend-cached-site7-local |
| 85 | 250 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | 250 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk |
| 86 | 251 | http-request set-header Host site7.local | 251 | http-request set-header Host site7.local |
| 88 | 252 | http-request set-header X-Cache-Request-IP %[src] | 252 | http-request set-header X-Forwarded-For %[src] |
| 89 | 253 | balance leastconn | 253 | balance leastconn |
| 90 | 254 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 254 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
| 91 | 255 | 255 | ||
| 92 | @@ -263,7 +263,7 @@ backend backend-site7-local | |||
| 93 | 263 | backend backend-cached-site8-local | 263 | backend backend-cached-site8-local |
| 94 | 264 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | 264 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk |
| 95 | 265 | http-request set-header Host site8.local | 265 | http-request set-header Host site8.local |
| 97 | 266 | http-request set-header X-Cache-Request-IP %[src] | 266 | http-request set-header X-Forwarded-For %[src] |
| 98 | 267 | balance leastconn | 267 | balance leastconn |
| 99 | 268 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 268 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
| 100 | 269 | 269 | ||
| 101 | @@ -284,7 +284,7 @@ backend backend-site8-local-2 | |||
| 102 | 284 | backend backend-cached-site9-local | 284 | backend backend-cached-site9-local |
| 103 | 285 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | 285 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk |
| 104 | 286 | http-request set-header Host site9.local | 286 | http-request set-header Host site9.local |
| 106 | 287 | http-request set-header X-Cache-Request-IP %[src] | 287 | http-request set-header X-Forwarded-For %[src] |
| 107 | 288 | balance leastconn | 288 | balance leastconn |
| 108 | 289 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 289 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
| 109 | 290 | 290 | ||
| 110 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt | |||
| 111 | index 7931e5e..a571e92 100644 | |||
| 112 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt | |||
| 113 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt | |||
| 114 | @@ -92,7 +92,7 @@ listen site1-local | |||
| 115 | 92 | backend backend-cached-site1-local | 92 | backend backend-cached-site1-local |
| 116 | 93 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | 93 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk |
| 117 | 94 | http-request set-header Host site1.local | 94 | http-request set-header Host site1.local |
| 119 | 95 | http-request set-header X-Cache-Request-IP %[src] | 95 | http-request set-header X-Forwarded-For %[src] |
| 120 | 96 | balance leastconn | 96 | balance leastconn |
| 121 | 97 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200 | 97 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200 |
| 122 | 98 | 98 | ||
| 123 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt | |||
| 124 | index e8536e0..bd66f8d 100644 | |||
| 125 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt | |||
| 126 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt | |||
| 127 | @@ -98,7 +98,7 @@ listen site1-local | |||
| 128 | 98 | backend backend-cached-site1-local | 98 | backend backend-cached-site1-local |
| 129 | 99 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | 99 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk |
| 130 | 100 | http-request set-header Host site1.local | 100 | http-request set-header Host site1.local |
| 132 | 101 | http-request set-header X-Cache-Request-IP %[src] | 101 | http-request set-header X-Forwarded-For %[src] |
| 133 | 102 | balance leastconn | 102 | balance leastconn |
| 134 | 103 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200 | 103 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200 |
| 135 | 104 | 104 | ||
| 136 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt | |||
| 137 | index 47c5663..d28fd68 100644 | |||
| 138 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt | |||
| 139 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt | |||
| 140 | @@ -157,7 +157,7 @@ listen site9-local | |||
| 141 | 157 | backend backend-cached-site1-local | 157 | backend backend-cached-site1-local |
| 142 | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk |
| 143 | 159 | http-request set-header Host site1.local | 159 | http-request set-header Host site1.local |
| 145 | 160 | http-request set-header X-Cache-Request-IP %[src] | 160 | http-request set-header X-Forwarded-For %[src] |
| 146 | 161 | balance leastconn | 161 | balance leastconn |
| 147 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
| 148 | 163 | 163 | ||
| 149 | @@ -173,7 +173,7 @@ backend backend-site1-local | |||
| 150 | 173 | backend backend-cached-site2-local | 173 | backend backend-cached-site2-local |
| 151 | 174 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | 174 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk |
| 152 | 175 | http-request set-header Host site2.local | 175 | http-request set-header Host site2.local |
| 154 | 176 | http-request set-header X-Cache-Request-IP %[src] | 176 | http-request set-header X-Forwarded-For %[src] |
| 155 | 177 | balance leastconn | 177 | balance leastconn |
| 156 | 178 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 178 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
| 157 | 179 | 179 | ||
| 158 | @@ -189,7 +189,7 @@ backend backend-site2-local | |||
| 159 | 189 | backend backend-cached-site3-local | 189 | backend backend-cached-site3-local |
| 160 | 190 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | 190 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk |
| 161 | 191 | http-request set-header Host site3.local | 191 | http-request set-header Host site3.local |
| 163 | 192 | http-request set-header X-Cache-Request-IP %[src] | 192 | http-request set-header X-Forwarded-For %[src] |
| 164 | 193 | balance leastconn | 193 | balance leastconn |
| 165 | 194 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 194 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
| 166 | 195 | 195 | ||
| 167 | @@ -207,14 +207,14 @@ backend backend-site3-local | |||
| 168 | 207 | backend backend-cached-site4-local | 207 | backend backend-cached-site4-local |
| 169 | 208 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | 208 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk |
| 170 | 209 | http-request set-header Host site4.local | 209 | http-request set-header Host site4.local |
| 172 | 210 | http-request set-header X-Cache-Request-IP %[src] | 210 | http-request set-header X-Forwarded-For %[src] |
| 173 | 211 | balance leastconn | 211 | balance leastconn |
| 174 | 212 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 212 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
| 175 | 213 | 213 | ||
| 176 | 214 | backend backend-cached-site5 | 214 | backend backend-cached-site5 |
| 177 | 215 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | 215 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk |
| 178 | 216 | http-request set-header Host site5.local | 216 | http-request set-header Host site5.local |
| 180 | 217 | http-request set-header X-Cache-Request-IP %[src] | 217 | http-request set-header X-Forwarded-For %[src] |
| 181 | 218 | balance leastconn | 218 | balance leastconn |
| 182 | 219 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 219 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
| 183 | 220 | 220 | ||
| 184 | @@ -235,7 +235,7 @@ backend backend-site5-2 | |||
| 185 | 235 | backend backend-cached-site6-local | 235 | backend backend-cached-site6-local |
| 186 | 236 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | 236 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk |
| 187 | 237 | http-request set-header Host site6.local | 237 | http-request set-header Host site6.local |
| 189 | 238 | http-request set-header X-Cache-Request-IP %[src] | 238 | http-request set-header X-Forwarded-For %[src] |
| 190 | 239 | balance leastconn | 239 | balance leastconn |
| 191 | 240 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 240 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
| 192 | 241 | 241 | ||
| 193 | @@ -249,7 +249,7 @@ backend backend-site6-local | |||
| 194 | 249 | backend backend-cached-site7-local | 249 | backend backend-cached-site7-local |
| 195 | 250 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | 250 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk |
| 196 | 251 | http-request set-header Host site7.local | 251 | http-request set-header Host site7.local |
| 198 | 252 | http-request set-header X-Cache-Request-IP %[src] | 252 | http-request set-header X-Forwarded-For %[src] |
| 199 | 253 | balance leastconn | 253 | balance leastconn |
| 200 | 254 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 254 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
| 201 | 255 | 255 | ||
| 202 | @@ -263,7 +263,7 @@ backend backend-site7-local | |||
| 203 | 263 | backend backend-cached-site8-local | 263 | backend backend-cached-site8-local |
| 204 | 264 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | 264 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk |
| 205 | 265 | http-request set-header Host site8.local | 265 | http-request set-header Host site8.local |
| 207 | 266 | http-request set-header X-Cache-Request-IP %[src] | 266 | http-request set-header X-Forwarded-For %[src] |
| 208 | 267 | balance leastconn | 267 | balance leastconn |
| 209 | 268 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 268 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
| 210 | 269 | 269 | ||
| 211 | @@ -284,7 +284,7 @@ backend backend-site8-local-2 | |||
| 212 | 284 | backend backend-cached-site9-local | 284 | backend backend-cached-site9-local |
| 213 | 285 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | 285 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk |
| 214 | 286 | http-request set-header Host site9.local | 286 | http-request set-header Host site9.local |
| 216 | 287 | http-request set-header X-Cache-Request-IP %[src] | 287 | http-request set-header X-Forwarded-For %[src] |
| 217 | 288 | balance leastconn | 288 | balance leastconn |
| 218 | 289 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 289 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
| 219 | 290 | 290 | ||
| 220 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt | |||
| 221 | index b110384..194dd4c 100644 | |||
| 222 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt | |||
| 223 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt | |||
| 224 | @@ -97,7 +97,7 @@ listen site1-local-2 | |||
| 225 | 97 | backend backend-cached-site1-local | 97 | backend backend-cached-site1-local |
| 226 | 98 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | 98 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk |
| 227 | 99 | http-request set-header Host site1.local | 99 | http-request set-header Host site1.local |
| 229 | 100 | http-request set-header X-Cache-Request-IP %[src] | 100 | http-request set-header X-Forwarded-For %[src] |
| 230 | 101 | balance leastconn | 101 | balance leastconn |
| 231 | 102 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400 | 102 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400 |
| 232 | 103 | 103 | ||
| 233 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt | |||
| 234 | index 8ad76cb..09d9c9a 100644 | |||
| 235 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt | |||
| 236 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt | |||
| 237 | @@ -157,7 +157,7 @@ listen site9-local | |||
| 238 | 157 | backend backend-cached-site1-local | 157 | backend backend-cached-site1-local |
| 239 | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk |
| 240 | 159 | http-request set-header Host site1.local | 159 | http-request set-header Host site1.local |
| 242 | 160 | http-request set-header X-Cache-Request-IP %[src] | 160 | http-request set-header X-Forwarded-For %[src] |
| 243 | 161 | balance roundrobin | 161 | balance roundrobin |
| 244 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
| 245 | 163 | 163 | ||
| 246 | @@ -173,7 +173,7 @@ backend backend-site1-local | |||
| 247 | 173 | backend backend-cached-site2-local | 173 | backend backend-cached-site2-local |
| 248 | 174 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | 174 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk |
| 249 | 175 | http-request set-header Host site2.local | 175 | http-request set-header Host site2.local |
| 251 | 176 | http-request set-header X-Cache-Request-IP %[src] | 176 | http-request set-header X-Forwarded-For %[src] |
| 252 | 177 | balance roundrobin | 177 | balance roundrobin |
| 253 | 178 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 178 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
| 254 | 179 | 179 | ||
| 255 | @@ -189,7 +189,7 @@ backend backend-site2-local | |||
| 256 | 189 | backend backend-cached-site3-local | 189 | backend backend-cached-site3-local |
| 257 | 190 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | 190 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk |
| 258 | 191 | http-request set-header Host site3.local | 191 | http-request set-header Host site3.local |
| 260 | 192 | http-request set-header X-Cache-Request-IP %[src] | 192 | http-request set-header X-Forwarded-For %[src] |
| 261 | 193 | balance roundrobin | 193 | balance roundrobin |
| 262 | 194 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 194 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
| 263 | 195 | 195 | ||
| 264 | @@ -207,14 +207,14 @@ backend backend-site3-local | |||
| 265 | 207 | backend backend-cached-site4-local | 207 | backend backend-cached-site4-local |
| 266 | 208 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | 208 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk |
| 267 | 209 | http-request set-header Host site4.local | 209 | http-request set-header Host site4.local |
| 269 | 210 | http-request set-header X-Cache-Request-IP %[src] | 210 | http-request set-header X-Forwarded-For %[src] |
| 270 | 211 | balance roundrobin | 211 | balance roundrobin |
| 271 | 212 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 212 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
| 272 | 213 | 213 | ||
| 273 | 214 | backend backend-cached-site5 | 214 | backend backend-cached-site5 |
| 274 | 215 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | 215 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk |
| 275 | 216 | http-request set-header Host site5.local | 216 | http-request set-header Host site5.local |
| 277 | 217 | http-request set-header X-Cache-Request-IP %[src] | 217 | http-request set-header X-Forwarded-For %[src] |
| 278 | 218 | balance roundrobin | 218 | balance roundrobin |
| 279 | 219 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 219 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
| 280 | 220 | 220 | ||
| 281 | @@ -235,7 +235,7 @@ backend backend-site5-2 | |||
| 282 | 235 | backend backend-cached-site6-local | 235 | backend backend-cached-site6-local |
| 283 | 236 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | 236 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk |
| 284 | 237 | http-request set-header Host site6.local | 237 | http-request set-header Host site6.local |
| 286 | 238 | http-request set-header X-Cache-Request-IP %[src] | 238 | http-request set-header X-Forwarded-For %[src] |
| 287 | 239 | balance roundrobin | 239 | balance roundrobin |
| 288 | 240 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 240 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
| 289 | 241 | 241 | ||
| 290 | @@ -249,7 +249,7 @@ backend backend-site6-local | |||
| 291 | 249 | backend backend-cached-site7-local | 249 | backend backend-cached-site7-local |
| 292 | 250 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | 250 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk |
| 293 | 251 | http-request set-header Host site7.local | 251 | http-request set-header Host site7.local |
| 295 | 252 | http-request set-header X-Cache-Request-IP %[src] | 252 | http-request set-header X-Forwarded-For %[src] |
| 296 | 253 | balance roundrobin | 253 | balance roundrobin |
| 297 | 254 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 254 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
| 298 | 255 | 255 | ||
| 299 | @@ -263,7 +263,7 @@ backend backend-site7-local | |||
| 300 | 263 | backend backend-cached-site8-local | 263 | backend backend-cached-site8-local |
| 301 | 264 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | 264 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk |
| 302 | 265 | http-request set-header Host site8.local | 265 | http-request set-header Host site8.local |
| 304 | 266 | http-request set-header X-Cache-Request-IP %[src] | 266 | http-request set-header X-Forwarded-For %[src] |
| 305 | 267 | balance roundrobin | 267 | balance roundrobin |
| 306 | 268 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 268 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
| 307 | 269 | 269 | ||
| 308 | @@ -284,7 +284,7 @@ backend backend-site8-local-2 | |||
| 309 | 284 | backend backend-cached-site9-local | 284 | backend backend-cached-site9-local |
| 310 | 285 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | 285 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk |
| 311 | 286 | http-request set-header Host site9.local | 286 | http-request set-header Host site9.local |
| 313 | 287 | http-request set-header X-Cache-Request-IP %[src] | 287 | http-request set-header X-Forwarded-For %[src] |
| 314 | 288 | balance roundrobin | 288 | balance roundrobin |
| 315 | 289 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 289 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
| 316 | 290 | 290 | ||
| 317 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt | |||
| 318 | index fb75f2e..5d012fb 100644 | |||
| 319 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt | |||
| 320 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt | |||
| 321 | @@ -158,7 +158,7 @@ listen site9-local | |||
| 322 | 158 | backend backend-cached-site1-local | 158 | backend backend-cached-site1-local |
| 323 | 159 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | 159 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk |
| 324 | 160 | http-request set-header Host site1.local | 160 | http-request set-header Host site1.local |
| 326 | 161 | http-request set-header X-Cache-Request-IP %[src] | 161 | http-request set-header X-Forwarded-For %[src] |
| 327 | 162 | balance leastconn | 162 | balance leastconn |
| 328 | 163 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 163 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
| 329 | 164 | 164 | ||
| 330 | @@ -174,7 +174,7 @@ backend backend-site1-local | |||
| 331 | 174 | backend backend-cached-site2-local | 174 | backend backend-cached-site2-local |
| 332 | 175 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | 175 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk |
| 333 | 176 | http-request set-header Host site2.local | 176 | http-request set-header Host site2.local |
| 335 | 177 | http-request set-header X-Cache-Request-IP %[src] | 177 | http-request set-header X-Forwarded-For %[src] |
| 336 | 178 | balance leastconn | 178 | balance leastconn |
| 337 | 179 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 179 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
| 338 | 180 | 180 | ||
| 339 | @@ -190,7 +190,7 @@ backend backend-site2-local | |||
| 340 | 190 | backend backend-cached-site3-local | 190 | backend backend-cached-site3-local |
| 341 | 191 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | 191 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk |
| 342 | 192 | http-request set-header Host site3.local | 192 | http-request set-header Host site3.local |
| 344 | 193 | http-request set-header X-Cache-Request-IP %[src] | 193 | http-request set-header X-Forwarded-For %[src] |
| 345 | 194 | balance leastconn | 194 | balance leastconn |
| 346 | 195 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 195 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
| 347 | 196 | 196 | ||
| 348 | @@ -208,14 +208,14 @@ backend backend-site3-local | |||
| 349 | 208 | backend backend-cached-site4-local | 208 | backend backend-cached-site4-local |
| 350 | 209 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | 209 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk |
| 351 | 210 | http-request set-header Host site4.local | 210 | http-request set-header Host site4.local |
| 353 | 211 | http-request set-header X-Cache-Request-IP %[src] | 211 | http-request set-header X-Forwarded-For %[src] |
| 354 | 212 | balance leastconn | 212 | balance leastconn |
| 355 | 213 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 213 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
| 356 | 214 | 214 | ||
| 357 | 215 | backend backend-cached-site5 | 215 | backend backend-cached-site5 |
| 358 | 216 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | 216 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk |
| 359 | 217 | http-request set-header Host site5.local | 217 | http-request set-header Host site5.local |
| 361 | 218 | http-request set-header X-Cache-Request-IP %[src] | 218 | http-request set-header X-Forwarded-For %[src] |
| 362 | 219 | balance leastconn | 219 | balance leastconn |
| 363 | 220 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 220 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
| 364 | 221 | 221 | ||
| 365 | @@ -236,7 +236,7 @@ backend backend-site5-2 | |||
| 366 | 236 | backend backend-cached-site6-local | 236 | backend backend-cached-site6-local |
| 367 | 237 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | 237 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk |
| 368 | 238 | http-request set-header Host site6.local | 238 | http-request set-header Host site6.local |
| 370 | 239 | http-request set-header X-Cache-Request-IP %[src] | 239 | http-request set-header X-Forwarded-For %[src] |
| 371 | 240 | balance leastconn | 240 | balance leastconn |
| 372 | 241 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 241 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
| 373 | 242 | 242 | ||
| 374 | @@ -250,7 +250,7 @@ backend backend-site6-local | |||
| 375 | 250 | backend backend-cached-site7-local | 250 | backend backend-cached-site7-local |
| 376 | 251 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | 251 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk |
| 377 | 252 | http-request set-header Host site7.local | 252 | http-request set-header Host site7.local |
| 379 | 253 | http-request set-header X-Cache-Request-IP %[src] | 253 | http-request set-header X-Forwarded-For %[src] |
| 380 | 254 | balance leastconn | 254 | balance leastconn |
| 381 | 255 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 255 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
| 382 | 256 | 256 | ||
| 383 | @@ -264,7 +264,7 @@ backend backend-site7-local | |||
| 384 | 264 | backend backend-cached-site8-local | 264 | backend backend-cached-site8-local |
| 385 | 265 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | 265 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk |
| 386 | 266 | http-request set-header Host site8.local | 266 | http-request set-header Host site8.local |
| 388 | 267 | http-request set-header X-Cache-Request-IP %[src] | 267 | http-request set-header X-Forwarded-For %[src] |
| 389 | 268 | balance leastconn | 268 | balance leastconn |
| 390 | 269 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 269 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
| 391 | 270 | 270 | ||
| 392 | @@ -285,7 +285,7 @@ backend backend-site8-local-2 | |||
| 393 | 285 | backend backend-cached-site9-local | 285 | backend backend-cached-site9-local |
| 394 | 286 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | 286 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk |
| 395 | 287 | http-request set-header Host site9.local | 287 | http-request set-header Host site9.local |
| 397 | 288 | http-request set-header X-Cache-Request-IP %[src] | 288 | http-request set-header X-Forwarded-For %[src] |
| 398 | 289 | balance leastconn | 289 | balance leastconn |
| 399 | 290 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 290 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
| 400 | 291 | 291 | ||
| 401 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt | |||
| 402 | index f6c4138..97611bf 100644 | |||
| 403 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt | |||
| 404 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt | |||
| 405 | @@ -157,7 +157,7 @@ listen site9-local | |||
| 406 | 157 | backend backend-cached-site1-local | 157 | backend backend-cached-site1-local |
| 407 | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk |
| 408 | 159 | http-request set-header Host site1.local | 159 | http-request set-header Host site1.local |
| 410 | 160 | http-request set-header X-Cache-Request-IP %[src] | 160 | http-request set-header X-Forwarded-For %[src] |
| 411 | 161 | balance leastconn | 161 | balance leastconn |
| 412 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
| 413 | 163 | 163 | ||
| 414 | @@ -174,7 +174,7 @@ backend backend-site1-local | |||
| 415 | 174 | backend backend-cached-site2-local | 174 | backend backend-cached-site2-local |
| 416 | 175 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | 175 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk |
| 417 | 176 | http-request set-header Host site2.local | 176 | http-request set-header Host site2.local |
| 419 | 177 | http-request set-header X-Cache-Request-IP %[src] | 177 | http-request set-header X-Forwarded-For %[src] |
| 420 | 178 | balance leastconn | 178 | balance leastconn |
| 421 | 179 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 179 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
| 422 | 180 | 180 | ||
| 423 | @@ -191,7 +191,7 @@ backend backend-site2-local | |||
| 424 | 191 | backend backend-cached-site3-local | 191 | backend backend-cached-site3-local |
| 425 | 192 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | 192 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk |
| 426 | 193 | http-request set-header Host site3.local | 193 | http-request set-header Host site3.local |
| 428 | 194 | http-request set-header X-Cache-Request-IP %[src] | 194 | http-request set-header X-Forwarded-For %[src] |
| 429 | 195 | balance leastconn | 195 | balance leastconn |
| 430 | 196 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 196 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
| 431 | 197 | 197 | ||
| 432 | @@ -210,14 +210,14 @@ backend backend-site3-local | |||
| 433 | 210 | backend backend-cached-site4-local | 210 | backend backend-cached-site4-local |
| 434 | 211 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | 211 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk |
| 435 | 212 | http-request set-header Host site4.local | 212 | http-request set-header Host site4.local |
| 437 | 213 | http-request set-header X-Cache-Request-IP %[src] | 213 | http-request set-header X-Forwarded-For %[src] |
| 438 | 214 | balance leastconn | 214 | balance leastconn |
| 439 | 215 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 215 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
| 440 | 216 | 216 | ||
| 441 | 217 | backend backend-cached-site5 | 217 | backend backend-cached-site5 |
| 442 | 218 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | 218 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk |
| 443 | 219 | http-request set-header Host site5.local | 219 | http-request set-header Host site5.local |
| 445 | 220 | http-request set-header X-Cache-Request-IP %[src] | 220 | http-request set-header X-Forwarded-For %[src] |
| 446 | 221 | balance leastconn | 221 | balance leastconn |
| 447 | 222 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 222 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
| 448 | 223 | 223 | ||
| 449 | @@ -240,7 +240,7 @@ backend backend-site5-2 | |||
| 450 | 240 | backend backend-cached-site6-local | 240 | backend backend-cached-site6-local |
| 451 | 241 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | 241 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk |
| 452 | 242 | http-request set-header Host site6.local | 242 | http-request set-header Host site6.local |
| 454 | 243 | http-request set-header X-Cache-Request-IP %[src] | 243 | http-request set-header X-Forwarded-For %[src] |
| 455 | 244 | balance leastconn | 244 | balance leastconn |
| 456 | 245 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 245 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
| 457 | 246 | 246 | ||
| 458 | @@ -255,7 +255,7 @@ backend backend-site6-local | |||
| 459 | 255 | backend backend-cached-site7-local | 255 | backend backend-cached-site7-local |
| 460 | 256 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | 256 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk |
| 461 | 257 | http-request set-header Host site7.local | 257 | http-request set-header Host site7.local |
| 463 | 258 | http-request set-header X-Cache-Request-IP %[src] | 258 | http-request set-header X-Forwarded-For %[src] |
| 464 | 259 | balance leastconn | 259 | balance leastconn |
| 465 | 260 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 260 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
| 466 | 261 | 261 | ||
| 467 | @@ -270,7 +270,7 @@ backend backend-site7-local | |||
| 468 | 270 | backend backend-cached-site8-local | 270 | backend backend-cached-site8-local |
| 469 | 271 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | 271 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk |
| 470 | 272 | http-request set-header Host site8.local | 272 | http-request set-header Host site8.local |
| 472 | 273 | http-request set-header X-Cache-Request-IP %[src] | 273 | http-request set-header X-Forwarded-For %[src] |
| 473 | 274 | balance leastconn | 274 | balance leastconn |
| 474 | 275 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 275 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
| 475 | 276 | 276 | ||
| 476 | @@ -293,7 +293,7 @@ backend backend-site8-local-2 | |||
| 477 | 293 | backend backend-cached-site9-local | 293 | backend backend-cached-site9-local |
| 478 | 294 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | 294 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk |
| 479 | 295 | http-request set-header Host site9.local | 295 | http-request set-header Host site9.local |
| 481 | 296 | http-request set-header X-Cache-Request-IP %[src] | 296 | http-request set-header X-Forwarded-For %[src] |
| 482 | 297 | balance leastconn | 297 | balance leastconn |
| 483 | 298 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 298 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
| 484 | 299 | 299 | ||
| 485 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt | |||
| 486 | index 72b12df..a88388d 100644 | |||
| 487 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt | |||
| 488 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt | |||
| 489 | @@ -92,7 +92,7 @@ listen site1-local | |||
| 490 | 92 | backend backend-cached-site1-local | 92 | backend backend-cached-site1-local |
| 491 | 93 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | 93 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk |
| 492 | 94 | http-request set-header Host site1.local | 94 | http-request set-header Host site1.local |
| 494 | 95 | http-request set-header X-Cache-Request-IP %[src] | 95 | http-request set-header X-Forwarded-For %[src] |
| 495 | 96 | balance leastconn | 96 | balance leastconn |
| 496 | 97 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400 | 97 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400 |
| 497 | 98 | 98 | ||
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.