From da0ceb3ee8baae889e58e135b6d72c2e6fcefe1e Mon Sep 17 00:00:00 2001 From: Derek Trider Date: Thu, 27 Aug 2020 15:28:27 -0400 Subject: [PATCH] refactor: Replace logrus with edge-core logging in health check code Signed-off-by: Derek Trider --- pkg/restapi/healthcheck/operation/operations.go | 7 +++++-- test/bdd/go.mod | 1 - test/bdd/pkg/common/common_steps.go | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/restapi/healthcheck/operation/operations.go b/pkg/restapi/healthcheck/operation/operations.go index a46ecaf..cefc974 100644 --- a/pkg/restapi/healthcheck/operation/operations.go +++ b/pkg/restapi/healthcheck/operation/operations.go @@ -10,16 +10,19 @@ import ( "net/http" "time" - log "github.com/sirupsen/logrus" + "github.com/trustbloc/edge-core/pkg/log" "github.com/trustbloc/edv/pkg/internal/common/support" ) // API endpoints. const ( + logModuleName = "edv-healthcheck-restapi" healthCheckEndpoint = "/healthcheck" ) +var logger = log.New(logModuleName) + type healthCheckResp struct { Status string `json:"status"` CurrentTime time.Time `json:"currentTime"` @@ -56,6 +59,6 @@ func (o *Operation) healthCheckHandler(rw http.ResponseWriter, r *http.Request) CurrentTime: time.Now(), }) if err != nil { - log.Errorf("healthcheck response failure, %s", err) + logger.Errorf("healthcheck response failure, %s", err) } } diff --git a/test/bdd/go.mod b/test/bdd/go.mod index ac3e5fe..4f09c22 100644 --- a/test/bdd/go.mod +++ b/test/bdd/go.mod @@ -14,7 +14,6 @@ require ( github.com/google/tink/go v0.0.0-20200403150819-3a14bf4b3380 github.com/google/uuid v1.1.1 github.com/hyperledger/aries-framework-go v0.1.3 - github.com/sirupsen/logrus v1.4.2 github.com/tidwall/gjson v1.6.0 github.com/trustbloc/edge-core v0.1.4-0.20200826135230-320b0953ce08 github.com/trustbloc/edv v0.0.0-00010101000000-000000000000 diff --git a/test/bdd/pkg/common/common_steps.go b/test/bdd/pkg/common/common_steps.go index 9501801..ef745ab 100644 --- a/test/bdd/pkg/common/common_steps.go +++ b/test/bdd/pkg/common/common_steps.go @@ -11,12 +11,14 @@ import ( "net/http" "github.com/cucumber/godog" - logger "github.com/sirupsen/logrus" "github.com/tidwall/gjson" + "github.com/trustbloc/edge-core/pkg/log" "github.com/trustbloc/edv/test/bdd/pkg/context" ) +var logger = log.New("edv-bddtest-common") + // Steps is steps for VC BDD tests. type Steps struct { bddContext *context.BDDContext