From 9102240837e06e77cb013cb57491ca46c3b7b8a6 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Fri, 18 Nov 2022 15:39:52 +0100 Subject: [PATCH] internal/api/eosio_v2.go: HTTP Errors are now handled in the eosapi. This changes the log message abit and return haproxy status from "Down" to "Fail" --- internal/api/eosio_v2.go | 6 ------ internal/api/eosio_v2_test.go | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/internal/api/eosio_v2.go b/internal/api/eosio_v2.go index 374847a..b0d838f 100644 --- a/internal/api/eosio_v2.go +++ b/internal/api/eosio_v2.go @@ -52,12 +52,6 @@ func (e EosioV2) Call() (agentcheck.Response, string) { return resp, err.Error() } - // Check HTTP Status Code - if health.HTTPStatusCode > 299 { - resp := agentcheck.NewStatusMessageResponse(agentcheck.Down, "") - return resp, fmt.Sprintf("Taking offline because %v was received from backend", health.HTTPStatusCode) - } - // Fetch elasticsearch and nodeos block numbers from json. var es_block int64 = 0 var node_block int64 = 0 diff --git a/internal/api/eosio_v2_test.go b/internal/api/eosio_v2_test.go index ee40188..116589b 100644 --- a/internal/api/eosio_v2_test.go +++ b/internal/api/eosio_v2_test.go @@ -47,7 +47,7 @@ func TestEosioV2JsonFailure(t *testing.T) { assert.Equal(t, expected, check) } -func TestEosioV2HTTP500Down(t *testing.T) { +func TestEosioV2HTTP500Failed(t *testing.T) { var srv = httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { res.WriteHeader(500) @@ -57,9 +57,9 @@ func TestEosioV2HTTP500Down(t *testing.T) { api := NewEosioV2(srv.URL, "", 120) check, status := api.Call() - assert.Equal(t, "Taking offline because 500 was received from backend", status) + assert.Equal(t, "server returned HTTP 500 Internal Server Error", status) - expected := agentcheck.NewStatusMessageResponse(agentcheck.Down, "") + expected := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") assert.Equal(t, expected, check) }