reference logrus' global logger instead of passing and storing a logger reference everywhere

This commit is contained in:
R. Aidan Campbell 2021-10-10 07:49:50 -07:00
commit 1f7049a7c3
No known key found for this signature in database
GPG key ID: 0985399E9CD6A99B
202 changed files with 443 additions and 561 deletions

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

View file

@ -70,7 +70,7 @@ func (suite *UtilTestSuite) SetupTest() {
suite.log = testrig.NewTestLog()
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)
}