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/app/app.go | 5 +---- internal/api/client/app/appcreate.go | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'internal/api/client/app') diff --git a/internal/api/client/app/app.go b/internal/api/client/app/app.go index 0366ae21f..b3df7c388 100644 --- a/internal/api/client/app/app.go +++ b/internal/api/client/app/app.go @@ -21,7 +21,6 @@ package app 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" @@ -35,15 +34,13 @@ const BasePath = "/api/v1/apps" type Module struct { config *config.Config processor processing.Processor - log *logrus.Logger } // New returns a new auth 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/app/appcreate.go b/internal/api/client/app/appcreate.go index e4cbc32d0..0c9407ae1 100644 --- a/internal/api/client/app/appcreate.go +++ b/internal/api/client/app/appcreate.go @@ -20,6 +20,7 @@ package app import ( "fmt" + "github.com/sirupsen/logrus" "net/http" "github.com/gin-gonic/gin" @@ -63,7 +64,7 @@ import ( // '500': // description: internal error func (m *Module) AppsPOSTHandler(c *gin.Context) { - l := m.log.WithField("func", "AppsPOSTHandler") + l := logrus.WithField("func", "AppsPOSTHandler") l.Trace("entering AppsPOSTHandler") authed, err := oauth.Authed(c, false, false, false, false) -- cgit v1.2.3