umputun/reproxy
1
1
Fork 0
mirror of https://github.com/umputun/reproxy.git synced 2024-09-11 08:55:25 +03:00
Code Issues Projects Releases Wiki Activity

add total number of services to health error

Browse Source
This commit is contained in:
Umputun 2021-04-17 23:06:48 -05:00
parent 1aa89cfbd6
commit f304a2f0e6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/proxy/health.go
View File

@ -81,11 +81,12 @@ func (h *Http) healthHandler(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(http.StatusExpectationFailed)
errResp := struct {
Status string `json:"status,omitempty"`
Passed int `json:"passed,omitempty"`
Failed int `json:"failed,omitempty"`
Errors []string `json:"errors,omitempty"`
}{Status: "failed", Passed: valid, Failed: total - valid, Errors: errs}
Status string `json:"status,omitempty"`
Services int `json:"services,omitempty"`
Passed int `json:"passed,omitempty"`
Failed int `json:"failed,omitempty"`
Errors []string `json:"errors,omitempty"`
}{Status: "failed", Services: total, Passed: valid, Failed: total - valid, Errors: errs}
rest.RenderJSON(w, errResp)
return

5
app/proxy/health_test.go
View File

@ -41,6 +41,7 @@ func TestHttp_healthHandler(t *testing.T) {
svc := discovery.NewService([]discovery.Provider{
&provider.Static{Rules: []string{
"localhost,^/api/(.*)," + ds.URL + "/123/$1," + ps.URL + "/123/ping",
"localhost,^/xyz/(.*)," + ds.URL + "/123/$1," + ps.URL + "/xxx/ping",
"127.0.0.1,^/api/(.*)," + ds.URL + "/567/$1," + ps.URL + "/567/ping",
},
}}, time.Millisecond*10)
@ -67,7 +68,9 @@ func TestHttp_healthHandler(t *testing.T) {
err = json.NewDecoder(resp.Body).Decode(&res)
require.NoError(t, err)
assert.Equal(t, "failed", res["status"])
assert.Equal(t, 3., res["services"])
assert.Equal(t, 1., res["passed"])
assert.Equal(t, 1., res["failed"])
assert.Equal(t, 2., res["failed"])
assert.Equal(t, 2, len(res["errors"].([]interface{})))
assert.Contains(t, res["errors"].([]interface{})[0], "400 Bad Request")
}