RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-14 01:30:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: contrib/prometheus-exporter: avoid connection close header

Browse Source 
it does not seem to have a reason to close connections after each
request; reflect that in tests by doing all requests within the same
client.

Signed-off-by: William Dauchy <wdauchy@gmail.com>
This commit is contained in:
William Dauchy 2021-01-11 20:07:48 +01:00 committed by Christopher Faulet
parent 50f757c5fd
commit 1704efee89
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/prometheus-exporter/service-prometheus.c
View File

@ -2459,7 +2459,6 @@ static int promex_send_headers(struct appctx *appctx, struct stream_interface *s
goto full;
sl->info.res.status = 200;
if (!htx_add_header(htx, ist("Cache-Control"), ist("no-cache")) ||
!htx_add_header(htx, ist("Connection"), ist("close")) ||
!htx_add_header(htx, ist("Content-Type"), ist("text/plain; version=0.0.4")) ||
!htx_add_header(htx, ist("Transfer-Encoding"), ist("chunked")) ||
!htx_add_endof(htx, HTX_BLK_EOH))

16
reg-tests/contrib/prometheus.vtc
View File

@ -37,22 +37,12 @@ client c1 -connect ${h1_stats_sock} {
expect resp.body ~ ".*haproxy_frontend.*"
expect resp.body ~ ".*haproxy_backend.*"
expect resp.body ~ ".*haproxy_server.*"
} -run
client c2 -connect ${h1_stats_sock} {
txreq -url "/metrics?scope"
rxresp
expect resp.status == 400
} -run
client c3 -connect ${h1_stats_sock} {
txreq -url "/metrics?scope="
rxresp
expect resp.status == 200
expect resp.bodylen == 0
} -run
client c4 -connect ${h1_stats_sock} {
txreq -url "/metrics?scope=server"
rxresp
expect resp.status == 200
@ -60,9 +50,7 @@ client c4 -connect ${h1_stats_sock} {
expect resp.body !~ ".*haproxy_frontend.*"
expect resp.body !~ ".*haproxy_backend.*"
expect resp.body ~ ".*haproxy_server.*"
} -run
client c5 -connect ${h1_stats_sock} {
txreq -url "/metrics?scope=frontend&scope=backend"
rxresp
expect resp.status == 200
@ -70,4 +58,8 @@ client c5 -connect ${h1_stats_sock} {
expect resp.body ~ ".*haproxy_frontend.*"
expect resp.body ~ ".*haproxy_backend.*"
expect resp.body !~ ".*haproxy_server.*"
txreq -url "/metrics?scope"
rxresp
expect resp.status == 400
} -run