From 083099a9575f8b2fac22c1d4a51a9dd0e2201243 Mon Sep 17 00:00:00 2001
From: "R. Aidan Campbell" <raidancampbell@users.noreply.github.com>
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/instance/instance.go      | 5 +----
 internal/api/client/instance/instanceget.go   | 3 ++-
 internal/api/client/instance/instancepatch.go | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'internal/api/client/instance')

diff --git a/internal/api/client/instance/instance.go b/internal/api/client/instance/instance.go
index a5becf97d..33e0054c3 100644
--- a/internal/api/client/instance/instance.go
+++ b/internal/api/client/instance/instance.go
@@ -3,7 +3,6 @@ package instance
 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"
@@ -19,15 +18,13 @@ const (
 type Module struct {
 	config    *config.Config
 	processor processing.Processor
-	log       *logrus.Logger
 }
 
 // New returns a new instance information 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/instance/instanceget.go b/internal/api/client/instance/instanceget.go
index 0a6d17153..fac917b25 100644
--- a/internal/api/client/instance/instanceget.go
+++ b/internal/api/client/instance/instanceget.go
@@ -1,6 +1,7 @@
 package instance
 
 import (
+	"github.com/sirupsen/logrus"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -29,7 +30,7 @@ import (
 //   '500':
 //      description: internal error
 func (m *Module) InstanceInformationGETHandler(c *gin.Context) {
-	l := m.log.WithField("func", "InstanceInformationGETHandler")
+	l := logrus.WithField("func", "InstanceInformationGETHandler")
 
 	instance, err := m.processor.InstanceGet(c.Request.Context(), m.config.Host)
 	if err != nil {
diff --git a/internal/api/client/instance/instancepatch.go b/internal/api/client/instance/instancepatch.go
index fa37ccd8e..50923dd90 100644
--- a/internal/api/client/instance/instancepatch.go
+++ b/internal/api/client/instance/instancepatch.go
@@ -1,6 +1,7 @@
 package instance
 
 import (
+	"github.com/sirupsen/logrus"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -84,7 +85,7 @@ import (
 //   '400':
 //      description: bad request
 func (m *Module) InstanceUpdatePATCHHandler(c *gin.Context) {
-	l := m.log.WithField("func", "InstanceUpdatePATCHHandler")
+	l := logrus.WithField("func", "InstanceUpdatePATCHHandler")
 	authed, err := oauth.Authed(c, true, true, true, true)
 	if err != nil {
 		l.Debugf("couldn't auth: %s", err)
-- 
cgit v1.2.3