From ce79bdeb64f2c15f253c92c86dcb2a4e40d0c77a Mon Sep 17 00:00:00 2001 From: Olakunle Arewa Date: Fri, 14 Aug 2020 02:59:34 +0100 Subject: [PATCH] fix: default log is being used to for request/response logs --- responses.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/responses.go b/responses.go index 9d2bc50..f58865d 100644 --- a/responses.go +++ b/responses.go @@ -6,12 +6,12 @@ import ( "net/http" "github.com/rs/zerolog" - "github.com/rs/zerolog/log" ) // SendSuccess sends a JSON success message with status code 200 func SendSuccess(r *http.Request, w http.ResponseWriter, v interface{}) { - raw := getJSON(r, v) + log := zerolog.Ctx(r.Context()) + raw := getJSON(log, v) log.Info().Msg("") @@ -23,7 +23,8 @@ func SendSuccess(r *http.Request, w http.ResponseWriter, v interface{}) { // SendError sends a JSON error message func SendError(r *http.Request, w http.ResponseWriter, err APIError) { - raw := getJSON(r, err) + log := zerolog.Ctx(r.Context()) + raw := getJSON(log, err) log.Err(err).Msg("") @@ -33,11 +34,9 @@ func SendError(r *http.Request, w http.ResponseWriter, err APIError) { _, _ = w.Write(raw) } -func getJSON(r *http.Request, v interface{}) []byte { +func getJSON(log *zerolog.Logger, v interface{}) []byte { raw, _ := json.Marshal(v) - log := zerolog.Ctx(r.Context()) - // log API responses if v != nil { log.UpdateContext(func(ctx zerolog.Context) zerolog.Context {