From 383178073afe9e9c388d2e03a2e7364d5ddd5096 Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Wed, 6 Oct 2021 17:12:15 +0100 Subject: [PATCH] Fixup requests --- pkg/requests/builder.go | 10 +++++----- pkg/requests/logger.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/requests/builder.go b/pkg/requests/builder.go index cc56f4e5..6fb87f98 100644 --- a/pkg/requests/builder.go +++ b/pkg/requests/builder.go @@ -95,16 +95,16 @@ func (r *builder) Do() Result { func (r *builder) do() Result { req, err := http.NewRequestWithContext(r.context, r.method, r.endpoint, r.body) if err != nil { - debugLogger.Infof("Error creating request: %v", err) + debugLogger().Infof("Error creating request: %v", err) r.result = &result{err: fmt.Errorf("error creating request: %v", err)} return r.result } req.Header = r.header - traceLogger.Infof("Executing request: Method: %v, Endpoint: %v, Header: %+v", r.method, r.endpoint, r.header) + traceLogger().Infof("Executing request: Method: %v, Endpoint: %v, Header: %+v", r.method, r.endpoint, r.header) resp, err := http.DefaultClient.Do(req) if err != nil { - debugLogger.Infof("Error performing request: %v", err) + debugLogger().Infof("Error performing request: %v", err) r.result = &result{err: fmt.Errorf("error performing request: %v", err)} return r.result } @@ -112,12 +112,12 @@ func (r *builder) do() Result { defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body) if err != nil { - debugLogger.Infof("Error reading response body: %v", err) + debugLogger().Infof("Error reading response body: %v", err) r.result = &result{err: fmt.Errorf("error reading response body: %v", err)} return r.result } - traceLogger.Infof("Request result: Status: %s (%d), Body: %s", resp.Status, resp.StatusCode, string(body)) + traceLogger().Infof("Request result: Status: %s (%d), Body: %s", resp.Status, resp.StatusCode, string(body)) r.result = &result{response: resp, body: body} return r.result } diff --git a/pkg/requests/logger.go b/pkg/requests/logger.go index 7eb8023a..4f58c922 100644 --- a/pkg/requests/logger.go +++ b/pkg/requests/logger.go @@ -6,6 +6,6 @@ import ( ) var ( - debugLogger = klog.V(logger.RequestDebug) - traceLogger = klog.V(logger.RequestTrace) + debugLogger = func() klog.Verbose { return klog.V(logger.RequestDebug) } + traceLogger = func() klog.Verbose { return klog.V(logger.RequestTrace) } )