From de02f9d2e8397f9b2ef4176a4a13172bc54b5952 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 9 Dec 2024 10:52:25 +0100 Subject: [PATCH] fixed error --- internal/server/middleware_test.go | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/internal/server/middleware_test.go b/internal/server/middleware_test.go index a122433..e84f146 100644 --- a/internal/server/middleware_test.go +++ b/internal/server/middleware_test.go @@ -31,23 +31,24 @@ import ( "info-manager-proxy/internal/mock" "net/http" "testing" - log "github.com/sirupsen/logrus" + "log" + "github.com/sirupsen/logrus" + "go.elastic.co/ecslogrus" ) func TestRequestLoggingMiddleware(t *testing.T) { + logger := logrus.New() + logger.SetFormatter(&ecslogrus.Formatter{}) + log.SetOutput(logger.Writer()) + t.Run("should log request", func(t *testing.T) { + logger.SetLevel(logrus.InfoLevel) mock.SetUpGrpcServer() SetUpHttpGateway() var buf bytes.Buffer log.SetOutput(&buf) - originalFlags := log.Baselog.Flags() - defer func() { - log.SetOutput(nil) - log.SetFlags(originalFlags) - }() - http.Get("http://localhost:8082/api/v1/information/testId") logOutput := buf.String() @@ -56,18 +57,13 @@ func TestRequestLoggingMiddleware(t *testing.T) { }) t.Run("should not log request", func(t *testing.T) { + logger.SetLevel(logrus.InfoLevel) mock.SetUpGrpcServer() SetUpHttpGateway() var buf bytes.Buffer log.SetOutput(&buf) - originalFlags := log.Baselog.Flags() - defer func() { - log.SetOutput(nil) - log.SetFlags(originalFlags) - }() - http.Get("http://localhost:8082/") logOutput := buf.String() -- GitLab