From 2caad14e44cb6432bddb4f219e26b4a4038d2549 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 22 Dec 2022 12:41:26 +0100 Subject: [PATCH] go mod: Update github.com/eosswedenorg-go/haproxy to v1.0.1 --- go.mod | 2 +- go.sum | 4 ++-- internal/api/atomicasset.go | 2 +- internal/api/atomicasset_test.go | 2 +- internal/api/eosio_v1.go | 2 +- internal/api/eosio_v1_test.go | 4 ++-- internal/api/eosio_v2.go | 4 ++-- internal/api/eosio_v2_test.go | 10 +++++----- internal/server/server.go | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 74a589c..c723ab6 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/eosswedenorg-go/atomicasset v0.1.0 - github.com/eosswedenorg-go/haproxy v0.1.1 + github.com/eosswedenorg-go/haproxy v1.0.1 github.com/eosswedenorg-go/leapapi v0.2.1 github.com/eosswedenorg-go/pid v1.0.1 github.com/eosswedenorg-go/tcp_server v0.2.1 diff --git a/go.sum b/go.sum index 37d2764..3175817 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eosswedenorg-go/atomicasset v0.1.0 h1:HRxFO7tOdyyygbxJjPm810x09sOUPbJW6pleslAjU+c= github.com/eosswedenorg-go/atomicasset v0.1.0/go.mod h1:QWm39AIPrv0CsYI2SRajNxpRyrHg5kcQwa/a0hf0wVo= -github.com/eosswedenorg-go/haproxy v0.1.1 h1:ClOhoK3uGn70KzGCKHdYNvHoU72whfNq3LbqT/lWlOY= -github.com/eosswedenorg-go/haproxy v0.1.1/go.mod h1:WnDKkwYbgrpuKUOtUtWlGCgj43DMV+r4VKGdWSTYQeA= +github.com/eosswedenorg-go/haproxy v1.0.1 h1:N9tyQSvEDG9Fq+gBP0b7A8R5iZAqYCms2K6Nvqq8TfE= +github.com/eosswedenorg-go/haproxy v1.0.1/go.mod h1:rBXDRd72ifA/IvsZUpW8Q4gR5rbV/4DAuKC/lqDrwWQ= github.com/eosswedenorg-go/leapapi v0.2.1 h1:zeY4TtVbgIPpLcD4wl42u+G/K+YfTN9YtpY4cb51KMQ= github.com/eosswedenorg-go/leapapi v0.2.1/go.mod h1:RZPrRzqh3SqhEQiutvld6960xFCOUq7Xk2h8jhHw/lc= github.com/eosswedenorg-go/pid v1.0.1 h1:W4AEnnNwb041SpNR1uTZ/KbJ0OTA5eqiqIR1Q5Ah6A0= diff --git a/internal/api/atomicasset.go b/internal/api/atomicasset.go index 99b1ab8..7466bb0 100644 --- a/internal/api/atomicasset.go +++ b/internal/api/atomicasset.go @@ -38,7 +38,7 @@ func (e AtomicAsset) LogInfo() LogParams { func (e AtomicAsset) Call() (agentcheck.Response, string) { h, err := e.client.GetHealth() if err != nil { - resp := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + resp := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") return resp, err.Error() } diff --git a/internal/api/atomicasset_test.go b/internal/api/atomicasset_test.go index 57996a7..66babed 100644 --- a/internal/api/atomicasset_test.go +++ b/internal/api/atomicasset_test.go @@ -52,7 +52,7 @@ func TestAtomicAsset_JsonFailure(t *testing.T) { api := NewAtomicAsset(srv.URL, 120) check, _ := api.Call() - expected := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + expected := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") assert.Equal(t, expected, check) } diff --git a/internal/api/eosio_v1.go b/internal/api/eosio_v1.go index 695c72b..b46b693 100644 --- a/internal/api/eosio_v1.go +++ b/internal/api/eosio_v1.go @@ -47,7 +47,7 @@ func (e AntelopeV1) LogInfo() LogParams { func (e AntelopeV1) Call() (agentcheck.Response, string) { info, err := e.client.GetInfo() if err != nil { - resp := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + resp := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") return resp, err.Error() } diff --git a/internal/api/eosio_v1_test.go b/internal/api/eosio_v1_test.go index 421d9fb..fe91178 100644 --- a/internal/api/eosio_v1_test.go +++ b/internal/api/eosio_v1_test.go @@ -53,7 +53,7 @@ func TestAntelopeV1_JsonFailure(t *testing.T) { api := NewAntelopeV1(srv.URL, "", 120) check, _ := api.Call() - expected := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + expected := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") assert.Equal(t, expected, check) } @@ -69,7 +69,7 @@ func TestAntelopeV1_HTTP500Failed(t *testing.T) { assert.Equal(t, "server returned HTTP 500 Internal Server Error", status) - expected := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + expected := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") assert.Equal(t, expected, check) } diff --git a/internal/api/eosio_v2.go b/internal/api/eosio_v2.go index 6d5052d..ca9b588 100644 --- a/internal/api/eosio_v2.go +++ b/internal/api/eosio_v2.go @@ -46,7 +46,7 @@ func (e AntelopeV2) LogInfo() LogParams { func (e AntelopeV2) Call() (agentcheck.Response, string) { health, err := e.client.GetHealth() if err != nil { - resp := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + resp := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") return resp, err.Error() } @@ -67,7 +67,7 @@ func (e AntelopeV2) Call() (agentcheck.Response, string) { msg := fmt.Sprintf("Failed to get Elasticsearch and/or nodeos "+ "block numbers (es: %d, eos: %d)", es_block, node_block) - resp := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + resp := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") return resp, msg } diff --git a/internal/api/eosio_v2_test.go b/internal/api/eosio_v2_test.go index c03b6f3..2d67a6b 100644 --- a/internal/api/eosio_v2_test.go +++ b/internal/api/eosio_v2_test.go @@ -41,7 +41,7 @@ func TestAntelopeV2_JsonFailure(t *testing.T) { api := NewAntelopeV2(srv.URL, "", 120) check, _ := api.Call() - expected := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + expected := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") assert.Equal(t, expected, check) } @@ -57,7 +57,7 @@ func TestAntelopeV2_HTTP500Failed(t *testing.T) { assert.Equal(t, "server returned HTTP 500 Internal Server Error", status) - expected := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + expected := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") assert.Equal(t, expected, check) } @@ -292,7 +292,7 @@ func TestAntelopeV2_ElasticsFailed(t *testing.T) { assert.Equal(t, "Failed to get Elasticsearch and/or nodeos block numbers (es: 0, eos: 263148621)", status) - expected := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + expected := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") assert.Equal(t, expected, check) } @@ -339,7 +339,7 @@ func TestAntelopeV2_NodeosRPCFailed(t *testing.T) { assert.Equal(t, "Failed to get Elasticsearch and/or nodeos block numbers (es: 263148121, eos: 0)", status) - expected := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + expected := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") assert.Equal(t, expected, check) } @@ -376,6 +376,6 @@ func TestAntelopeV2_ElasticsNodeosRPCFailed(t *testing.T) { assert.Equal(t, "Failed to get Elasticsearch and/or nodeos block numbers (es: 0, eos: 0)", status) - expected := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + expected := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") assert.Equal(t, expected, check) } diff --git a/internal/server/server.go b/internal/server/server.go index d050bab..eec480f 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -20,7 +20,7 @@ func onTcpMessage(c *tcp_server.Client, args string) { healthCheckApi, err := ParseRequest(args) if err != nil { logger.Warn("Agent request error", "message", err) - resp := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") + resp := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "") _, err = c.WriteString(resp.String()) if err != nil {