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

3 files changed, 4 insertions, 6 deletions

diff --git a/internal/api/security/security.go b/internal/api/security/security.go
index d8f6b0fe3..5ed677467 100644
--- a/internal/api/security/security.go
+++ b/internal/api/security/security.go
@@ -21,7 +21,6 @@ package security
 import (
 	"net/http"
 
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/api"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
@@ -33,15 +32,13 @@ const robotsPath = "/robots.txt"
 // Module implements the ClientAPIModule interface for security middleware
 type Module struct {
 	config *config.Config
-	log    *logrus.Logger
 	db     db.DB
 }
 
 // New returns a new security module
-func New(config *config.Config, db db.DB, log *logrus.Logger) api.ClientModule {
+func New(config *config.Config, db db.DB) api.ClientModule {
 	return &Module{
 		config: config,
-		log:    log,
 		db:     db,
 	}
 }
diff --git a/internal/api/security/signaturecheck.go b/internal/api/security/signaturecheck.go
index be8c87c0d..a0f79e44d 100644
--- a/internal/api/security/signaturecheck.go
+++ b/internal/api/security/signaturecheck.go
@@ -1,6 +1,7 @@
 package security
 
 import (
+	"github.com/sirupsen/logrus"
 	"net/http"
 	"net/url"
 
@@ -13,7 +14,7 @@ import (
 // that signed the request is permitted to access the server. If it is permitted, the handler will set the key
 // verifier and the signature in the gin context for use down the line.
 func (m *Module) SignatureCheck(c *gin.Context) {
-	l := m.log.WithField("func", "DomainBlockChecker")
+	l := logrus.WithField("func", "DomainBlockChecker")
 
 	// create the verifier from the request
 	// if the request is signed, it will have a signature header
diff --git a/internal/api/security/useragentblock.go b/internal/api/security/useragentblock.go
index 1498d441b..bc9586199 100644
--- a/internal/api/security/useragentblock.go
+++ b/internal/api/security/useragentblock.go
@@ -27,7 +27,7 @@ import (
 
 // UserAgentBlock blocks requests with undesired, empty, or invalid user-agent strings.
 func (m *Module) UserAgentBlock(c *gin.Context) {
-	l := m.log.WithFields(logrus.Fields{
+	l := logrus.WithFields(logrus.Fields{
 		"func": "UserAgentBlock",
 	})