From 7b3cd836fd284bc71deef56645c7c5afa47afecf Mon Sep 17 00:00:00 2001 From: dhax Date: Tue, 7 Sep 2021 18:35:26 +0200 Subject: [PATCH] update logrus --- go.mod | 4 +--- logging/logger.go | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index b269c5d..376a912 100644 --- a/go.mod +++ b/go.mod @@ -24,9 +24,7 @@ require ( github.com/mssola/user_agent v0.5.1 github.com/olekukonko/tablewriter v0.0.4 // indirect github.com/onsi/gomega v1.4.2 // indirect - github.com/pelletier/go-toml v1.6.0 // indirect - github.com/sirupsen/logrus v1.4.2 - github.com/spf13/afero v1.2.2 // indirect + github.com/sirupsen/logrus v1.8.1 github.com/spf13/cast v1.3.1 // indirect github.com/spf13/cobra v0.0.6 github.com/spf13/jwalterweatherman v1.1.0 // indirect diff --git a/logging/logger.go b/logging/logger.go index f45602c..23666b2 100644 --- a/logging/logger.go +++ b/logging/logger.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/go-chi/chi/middleware" + "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" "github.com/spf13/viper" ) @@ -76,7 +76,7 @@ func (l *StructuredLogger) NewLogEntry(r *http.Request) middleware.LogEntry { logFields["user_agent"] = r.UserAgent() logFields["uri"] = fmt.Sprintf("%s://%s%s", scheme, r.Host, r.RequestURI) - logFields["uri"] = fmt.Sprintf("%s", r.RequestURI) + logFields["uri"] = r.RequestURI entry.Logger = entry.Logger.WithFields(logFields) @@ -90,7 +90,7 @@ type StructuredLoggerEntry struct { Logger logrus.FieldLogger } -func (l *StructuredLoggerEntry) Write(status, bytes int, elapsed time.Duration) { +func (l *StructuredLoggerEntry) Write(status, bytes int, header http.Header, elapsed time.Duration, extra interface{}) { l.Logger = l.Logger.WithFields(logrus.Fields{ "resp_status": status, "resp_bytes_length": bytes,