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

7 files changed, 7 insertions, 15 deletions

diff --git a/internal/text/common.go b/internal/text/common.go
index d57e57754..1c7d52905 100644
--- a/internal/text/common.go
+++ b/internal/text/common.go
@@ -21,6 +21,7 @@ package text
 import (
 	"context"
 	"fmt"
+	"github.com/sirupsen/logrus"
 	"html"
 	"strings"
 
@@ -100,7 +101,7 @@ func (f *formatter) ReplaceMentions(ctx context.Context, in string, mentions []*
 				if menchie.TargetAccount == nil {
 					a, err := f.db.GetAccountByID(ctx, menchie.TargetAccountID)
 					if err != nil {
-						f.log.Errorf("error getting account with id %s from the db: %s", menchie.TargetAccountID, err)
+						logrus.Errorf("error getting account with id %s from the db: %s", menchie.TargetAccountID, err)
 						return match
 					}
 					menchie.TargetAccount = a
diff --git a/internal/text/common_test.go b/internal/text/common_test.go
index cb6d95c14..19851956e 100644
--- a/internal/text/common_test.go
+++ b/internal/text/common_test.go
@@ -89,8 +89,7 @@ func (suite *CommonTestSuite) SetupSuite() {
 func (suite *CommonTestSuite) SetupTest() {
 	suite.config = testrig.NewTestConfig()
 	suite.db = testrig.NewTestDB()
-	suite.log = testrig.NewTestLog()
-	suite.formatter = text.NewFormatter(suite.config, suite.db, suite.log)
+	suite.formatter = text.NewFormatter(suite.config, suite.db)
 
 	testrig.StandardDBSetup(suite.db, nil)
 }
diff --git a/internal/text/formatter.go b/internal/text/formatter.go
index 769ecafbb..b0988e9f9 100644
--- a/internal/text/formatter.go
+++ b/internal/text/formatter.go
@@ -21,7 +21,6 @@ package text
 import (
 	"context"
 
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
@@ -45,14 +44,12 @@ type Formatter interface {
 type formatter struct {
 	cfg *config.Config
 	db  db.DB
-	log *logrus.Logger
 }
 
 // NewFormatter returns a new Formatter interface for parsing statuses and other text input into nice html.
-func NewFormatter(cfg *config.Config, db db.DB, log *logrus.Logger) Formatter {
+func NewFormatter(cfg *config.Config, db db.DB) Formatter {
 	return &formatter{
 		cfg: cfg,
 		db:  db,
-		log: log,
 	}
 }
diff --git a/internal/text/formatter_test.go b/internal/text/formatter_test.go
index 228da4ec7..d01f1418e 100644
--- a/internal/text/formatter_test.go
+++ b/internal/text/formatter_test.go
@@ -19,7 +19,6 @@
 package text_test
 
 import (
-	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/suite"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
@@ -33,7 +32,6 @@ type TextStandardTestSuite struct {
 	suite.Suite
 	config *config.Config
 	db     db.DB
-	log    *logrus.Logger
 
 	// standard suite models
 	testTokens       map[string]*gtsmodel.Token
diff --git a/internal/text/link_test.go b/internal/text/link_test.go
index f8d6a1adc..0709e4ad1 100644
--- a/internal/text/link_test.go
+++ b/internal/text/link_test.go
@@ -84,8 +84,7 @@ func (suite *LinkTestSuite) SetupSuite() {
 func (suite *LinkTestSuite) SetupTest() {
 	suite.config = testrig.NewTestConfig()
 	suite.db = testrig.NewTestDB()
-	suite.log = testrig.NewTestLog()
-	suite.formatter = text.NewFormatter(suite.config, suite.db, suite.log)
+	suite.formatter = text.NewFormatter(suite.config, suite.db)
 
 	testrig.StandardDBSetup(suite.db, nil)
 }
diff --git a/internal/text/markdown_test.go b/internal/text/markdown_test.go
index 085f211d2..3faa69c08 100644
--- a/internal/text/markdown_test.go
+++ b/internal/text/markdown_test.go
@@ -82,8 +82,7 @@ func (suite *MarkdownTestSuite) SetupSuite() {
 func (suite *MarkdownTestSuite) SetupTest() {
 	suite.config = testrig.NewTestConfig()
 	suite.db = testrig.NewTestDB()
-	suite.log = testrig.NewTestLog()
-	suite.formatter = text.NewFormatter(suite.config, suite.db, suite.log)
+	suite.formatter = text.NewFormatter(suite.config, suite.db)
 
 	testrig.StandardDBSetup(suite.db, suite.testAccounts)
 }
diff --git a/internal/text/plain_test.go b/internal/text/plain_test.go
index 62c43406d..b353fb284 100644
--- a/internal/text/plain_test.go
+++ b/internal/text/plain_test.go
@@ -64,8 +64,7 @@ func (suite *PlainTestSuite) SetupSuite() {
 func (suite *PlainTestSuite) SetupTest() {
 	suite.config = testrig.NewTestConfig()
 	suite.db = testrig.NewTestDB()
-	suite.log = testrig.NewTestLog()
-	suite.formatter = text.NewFormatter(suite.config, suite.db, suite.log)
+	suite.formatter = text.NewFormatter(suite.config, suite.db)
 
 	testrig.StandardDBSetup(suite.db, nil)
 }