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, 5 insertions, 10 deletions

diff --git a/internal/processing/status/status.go b/internal/processing/status/status.go
index 10faa5696..666c237b7 100644
--- a/internal/processing/status/status.go
+++ b/internal/processing/status/status.go
@@ -21,7 +21,6 @@ package status
 import (
 	"context"
 
-	"github.com/sirupsen/logrus"
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
@@ -77,18 +76,16 @@ type processor struct {
 	filter        visibility.Filter
 	formatter     text.Formatter
 	fromClientAPI chan messages.FromClientAPI
-	log           *logrus.Logger
 }
 
 // New returns a new status processor.
-func New(db db.DB, tc typeutils.TypeConverter, config *config.Config, fromClientAPI chan messages.FromClientAPI, log *logrus.Logger) Processor {
+func New(db db.DB, tc typeutils.TypeConverter, config *config.Config, fromClientAPI chan messages.FromClientAPI) Processor {
 	return &processor{
 		tc:            tc,
 		config:        config,
 		db:            db,
-		filter:        visibility.NewFilter(db, log),
-		formatter:     text.NewFormatter(config, db, log),
+		filter:        visibility.NewFilter(db),
+		formatter:     text.NewFormatter(config, db),
 		fromClientAPI: fromClientAPI,
-		log:           log,
 	}
 }
diff --git a/internal/processing/status/status_test.go b/internal/processing/status/status_test.go
index 707a4843b..c5c439057 100644
--- a/internal/processing/status/status_test.go
+++ b/internal/processing/status/status_test.go
@@ -19,7 +19,6 @@
 package status_test
 
 import (
-	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/suite"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
@@ -34,7 +33,6 @@ type StatusStandardTestSuite struct {
 	suite.Suite
 	config            *config.Config
 	db                db.DB
-	log               *logrus.Logger
 	typeConverter     typeutils.TypeConverter
 	fromClientAPIChan chan messages.FromClientAPI
 
diff --git a/internal/processing/status/util_test.go b/internal/processing/status/util_test.go
index f80cf9342..37e2f2dfc 100644
--- a/internal/processing/status/util_test.go
+++ b/internal/processing/status/util_test.go
@@ -67,10 +67,10 @@ func (suite *UtilTestSuite) SetupSuite() {
 func (suite *UtilTestSuite) SetupTest() {
 	suite.config = testrig.NewTestConfig()
 	suite.db = testrig.NewTestDB()
-	suite.log = testrig.NewTestLog()
+	testrig.InitTestLog()
 	suite.typeConverter = testrig.NewTestTypeConverter(suite.db)
 	suite.fromClientAPIChan = make(chan messages.FromClientAPI, 100)
-	suite.status = status.New(suite.db, suite.typeConverter, suite.config, suite.fromClientAPIChan, suite.log)
+	suite.status = status.New(suite.db, suite.typeConverter, suite.config, suite.fromClientAPIChan)
 
 	testrig.StandardDBSetup(suite.db, nil)
 }