From 083099a9575f8b2fac22c1d4a51a9dd0e2201243 Mon Sep 17 00:00:00 2001 From: "R. Aidan Campbell" Date: Mon, 11 Oct 2021 05:37:33 -0700 Subject: reference global logrus (#274) * reference logrus' global logger instead of passing and storing a logger reference everywhere * always directly use global logrus logger instead of referencing an instance * test suites should also directly use the global logrus logger * rename gin logging function to clarify that it's middleware * correct comments which erroneously referenced removed logger parameter * setting log level for tests now uses logrus' exported type instead of the string value, to guarantee error isn't possible --- internal/api/client/timeline/home.go | 3 ++- internal/api/client/timeline/public.go | 3 ++- internal/api/client/timeline/timeline.go | 5 +---- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'internal/api/client/timeline') diff --git a/internal/api/client/timeline/home.go b/internal/api/client/timeline/home.go index 6df4b29d0..ef5aa48b6 100644 --- a/internal/api/client/timeline/home.go +++ b/internal/api/client/timeline/home.go @@ -19,6 +19,7 @@ package timeline import ( + "github.com/sirupsen/logrus" "net/http" "strconv" @@ -102,7 +103,7 @@ import ( // '400': // description: bad request func (m *Module) HomeTimelineGETHandler(c *gin.Context) { - l := m.log.WithField("func", "HomeTimelineGETHandler") + l := logrus.WithField("func", "HomeTimelineGETHandler") authed, err := oauth.Authed(c, true, true, true, true) if err != nil { diff --git a/internal/api/client/timeline/public.go b/internal/api/client/timeline/public.go index 8c8c9f120..049078e4d 100644 --- a/internal/api/client/timeline/public.go +++ b/internal/api/client/timeline/public.go @@ -19,6 +19,7 @@ package timeline import ( + "github.com/sirupsen/logrus" "net/http" "strconv" @@ -102,7 +103,7 @@ import ( // '400': // description: bad request func (m *Module) PublicTimelineGETHandler(c *gin.Context) { - l := m.log.WithField("func", "PublicTimelineGETHandler") + l := logrus.WithField("func", "PublicTimelineGETHandler") authed, err := oauth.Authed(c, true, true, true, true) if err != nil { diff --git a/internal/api/client/timeline/timeline.go b/internal/api/client/timeline/timeline.go index 72c9357b1..2aa939f61 100644 --- a/internal/api/client/timeline/timeline.go +++ b/internal/api/client/timeline/timeline.go @@ -21,7 +21,6 @@ package timeline import ( "net/http" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/processing" @@ -51,15 +50,13 @@ const ( type Module struct { config *config.Config processor processing.Processor - log *logrus.Logger } // New returns a new timeline module -func New(config *config.Config, processor processing.Processor, log *logrus.Logger) api.ClientModule { +func New(config *config.Config, processor processing.Processor) api.ClientModule { return &Module{ config: config, processor: processor, - log: log, } } -- cgit v1.2.3