mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
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
This commit is contained in:
committed by
GitHub
parent
367bdca250
commit
083099a957
@@ -31,7 +31,7 @@ import (
|
||||
)
|
||||
|
||||
func (p *processor) OpenStreamForAccount(ctx context.Context, account *gtsmodel.Account, streamType string) (*stream.Stream, gtserror.WithCode) {
|
||||
l := p.log.WithFields(logrus.Fields{
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "OpenStreamForAccount",
|
||||
"account": account.ID,
|
||||
"streamType": streamType,
|
||||
|
@@ -22,7 +22,6 @@ import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
|
||||
@@ -47,16 +46,14 @@ type Processor interface {
|
||||
|
||||
type processor struct {
|
||||
db db.DB
|
||||
log *logrus.Logger
|
||||
oauthServer oauth.Server
|
||||
streamMap *sync.Map
|
||||
}
|
||||
|
||||
// New returns a new status processor.
|
||||
func New(db db.DB, oauthServer oauth.Server, log *logrus.Logger) Processor {
|
||||
func New(db db.DB, oauthServer oauth.Server) Processor {
|
||||
return &processor{
|
||||
db: db,
|
||||
log: log,
|
||||
oauthServer: oauthServer,
|
||||
streamMap: &sync.Map{},
|
||||
}
|
||||
|
@@ -19,7 +19,6 @@
|
||||
package streaming_test
|
||||
|
||||
import (
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/stretchr/testify/suite"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
||||
@@ -34,7 +33,6 @@ type StreamingTestSuite struct {
|
||||
testTokens map[string]*gtsmodel.Token
|
||||
db db.DB
|
||||
oauthServer oauth.Server
|
||||
log *logrus.Logger
|
||||
|
||||
streamingProcessor streaming.Processor
|
||||
}
|
||||
@@ -44,8 +42,8 @@ func (suite *StreamingTestSuite) SetupTest() {
|
||||
suite.testTokens = testrig.NewTestTokens()
|
||||
suite.db = testrig.NewTestDB()
|
||||
suite.oauthServer = testrig.NewTestOauthServer(suite.db)
|
||||
suite.log = testrig.NewTestLog()
|
||||
suite.streamingProcessor = streaming.New(suite.db, suite.oauthServer, suite.log)
|
||||
testrig.InitTestLog()
|
||||
suite.streamingProcessor = streaming.New(suite.db, suite.oauthServer)
|
||||
|
||||
testrig.StandardDBSetup(suite.db, suite.testAccounts)
|
||||
}
|
||||
|
Reference in New Issue
Block a user