SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

reference global logrus (#274)

Browse Source 
* 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
This commit is contained in:
R. Aidan Campbell
2021-10-11 05:37:33 -07:00
committed by GitHub
parent 367bdca250
commit 083099a957
210 changed files with 506 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/processing/status/status.go
View File

@@ -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,
}
}

2
internal/processing/status/status_test.go
View File

@@ -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

4
internal/processing/status/util_test.go
View File

@@ -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)
}