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/followrequest/accept.go | 3 ++- internal/api/client/followrequest/followrequest.go | 5 +---- internal/api/client/followrequest/get.go | 3 ++- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'internal/api/client/followrequest') diff --git a/internal/api/client/followrequest/accept.go b/internal/api/client/followrequest/accept.go index 3dba7673f..6f5613f3e 100644 --- a/internal/api/client/followrequest/accept.go +++ b/internal/api/client/followrequest/accept.go @@ -19,6 +19,7 @@ package followrequest import ( + "github.com/sirupsen/logrus" "net/http" "github.com/gin-gonic/gin" @@ -28,7 +29,7 @@ import ( // FollowRequestAcceptPOSTHandler deals with follow request accepting. It should be served at // /api/v1/follow_requests/:id/authorize func (m *Module) FollowRequestAcceptPOSTHandler(c *gin.Context) { - l := m.log.WithField("func", "statusCreatePOSTHandler") + l := logrus.WithField("func", "statusCreatePOSTHandler") authed, err := oauth.Authed(c, true, true, true, true) if err != nil { l.Debugf("couldn't auth: %s", err) diff --git a/internal/api/client/followrequest/followrequest.go b/internal/api/client/followrequest/followrequest.go index 71352294c..beedeb2d0 100644 --- a/internal/api/client/followrequest/followrequest.go +++ b/internal/api/client/followrequest/followrequest.go @@ -21,7 +21,6 @@ package followrequest 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" @@ -47,15 +46,13 @@ const ( type Module struct { config *config.Config processor processing.Processor - log *logrus.Logger } // New returns a new follow request 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, } } diff --git a/internal/api/client/followrequest/get.go b/internal/api/client/followrequest/get.go index 47e1d74ba..a07e3ad83 100644 --- a/internal/api/client/followrequest/get.go +++ b/internal/api/client/followrequest/get.go @@ -19,6 +19,7 @@ package followrequest import ( + "github.com/sirupsen/logrus" "net/http" "github.com/gin-gonic/gin" @@ -27,7 +28,7 @@ import ( // FollowRequestGETHandler allows clients to get a list of their incoming follow requests. func (m *Module) FollowRequestGETHandler(c *gin.Context) { - l := m.log.WithField("func", "statusCreatePOSTHandler") + l := logrus.WithField("func", "statusCreatePOSTHandler") authed, err := oauth.Authed(c, true, true, true, true) if err != nil { l.Debugf("couldn't auth: %s", err) -- cgit v1.3