diff options
Diffstat (limited to 'internal/processing/streaming')
-rw-r--r-- | internal/processing/streaming/openstream.go | 2 | ||||
-rw-r--r-- | internal/processing/streaming/streaming.go | 5 | ||||
-rw-r--r-- | internal/processing/streaming/streaming_test.go | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/internal/processing/streaming/openstream.go b/internal/processing/streaming/openstream.go index 74b6486f5..706cc0675 100644 --- a/internal/processing/streaming/openstream.go +++ b/internal/processing/streaming/openstream.go @@ -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, diff --git a/internal/processing/streaming/streaming.go b/internal/processing/streaming/streaming.go index abce30cd1..604ec1267 100644 --- a/internal/processing/streaming/streaming.go +++ b/internal/processing/streaming/streaming.go @@ -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{}, } diff --git a/internal/processing/streaming/streaming_test.go b/internal/processing/streaming/streaming_test.go index acc090b06..cbb899d12 100644 --- a/internal/processing/streaming/streaming_test.go +++ b/internal/processing/streaming/streaming_test.go @@ -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) } |