diff --git a/fe/http_debug.go b/fe/http_debug.go index cb656ef3287643c2b7eaecaaa9719a2e3269213d..bdbc6322f913b924b2c53d31bcc7483234fd5f3a 100644 --- a/fe/http_debug.go +++ b/fe/http_debug.go @@ -13,7 +13,7 @@ const debugText = `<html> <body> <title>Requests</title> <table> - <tr><th>IP</th><th>URL</th><th>Target</th></tr> + <tr><th>IP</th><th>URL</th><th>State</th><th>Target</th></tr> {{range .}} <tr> <td align=left>{{.RemoteAddr}}</td> diff --git a/fe/http_test.go b/fe/http_test.go index 2b849fc6a7dae2dd0fc4f4df0c78396712352d62..d944540d8c10699404b9dce018963662340df09d 100644 --- a/fe/http_test.go +++ b/fe/http_test.go @@ -111,6 +111,9 @@ func TestHttpRedirector_LBDebugPage(t *testing.T) { if !strings.Contains(data, "node1") { t.Errorf("Bad response:\n%s", data) } + if strings.Contains(data, "error executing template") { + t.Errorf("Error executing template:\n%s", data) + } } type httpTestContext struct { diff --git a/fe/lbv2/debug.go b/fe/lbv2/debug.go index 6bf69cdd2b9da7686b1e0612f914938cec600e4a..9e3a373cc4de881e907ca11d60d9b289f4916a07 100644 --- a/fe/lbv2/debug.go +++ b/fe/lbv2/debug.go @@ -18,10 +18,11 @@ const debugText = `<html> <tr> <td>{{.Name}}</td> <td>{{.Requests}}</td> + {{$data := .Data}} {{range $d := $dimensions}} - {{$data := index .Data $d}} + {{$cur := index $data $d}} <td> - {{$data.PredictedUtilization}}/{{$data.ReportedUtilization}}/{{$data.Cost}} + {{$cur.PredictedUtilization}}/{{$cur.ReportedUtilization}}/{{$cur.Cost}} </td> {{end}} </tr>