mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 15:42:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] move client/federator workerpools to Workers{} (#1575)

Browse source 
* replace concurrency worker pools with base models in State.Workers, update code and tests accordingly

* improve code comment

* change back testrig default log level

* un-comment-out TestAnnounceTwice() and fix

---------

Signed-off-by: kim <grufwub@gmail.com>
Reviewed-by: tobi
This commit is contained in:
kim 2023-03-01 18:26:53 +00:00 • committed by GitHub
commit baf933cb9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
130 changed files with 1037 additions and 1083 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/processing/stream/authorize.go
View file

@ -41,7 +41,7 @@ func (p *Processor) Authorize(ctx context.Context, accessToken string) (*gtsmode
return nil, gtserror.NewErrorUnauthorized(err)
}
user, err := p.db.GetUserByID(ctx, uid)
user, err := p.state.DB.GetUserByID(ctx, uid)
if err != nil {
if err == db.ErrNoEntries {
err := fmt.Errorf("no user found for validated uid %s", uid)
@ -50,7 +50,7 @@ func (p *Processor) Authorize(ctx context.Context, accessToken string) (*gtsmode
return nil, gtserror.NewErrorInternalError(err)
}
acct, err := p.db.GetAccountByID(ctx, user.AccountID)
acct, err := p.state.DB.GetAccountByID(ctx, user.AccountID)
if err != nil {
if err == db.ErrNoEntries {
err := fmt.Errorf("no account found for validated uid %s", uid)

11
internal/processing/stream/stream.go
View file

@ -22,22 +22,21 @@ import (
"errors"
"sync"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/superseriousbusiness/gotosocial/internal/stream"
)
type Processor struct {
db db.DB
state *state.State
oauthServer oauth.Server
streamMap *sync.Map
streamMap sync.Map
}
func New(db db.DB, oauthServer oauth.Server) Processor {
func New(state *state.State, oauthServer oauth.Server) Processor {
return Processor{
db: db,
state: state,
oauthServer: oauthServer,
streamMap: &sync.Map{},
}
}

9
internal/processing/stream/stream_test.go
View file

@ -24,6 +24,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/processing/stream"
"github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@ -33,19 +34,23 @@ type StreamTestSuite struct {
testTokens map[string]*gtsmodel.Token
db db.DB
oauthServer oauth.Server
state state.State
streamProcessor stream.Processor
}
func (suite *StreamTestSuite) SetupTest() {
suite.state.Caches.Init()
testrig.InitTestLog()
testrig.InitTestConfig()
suite.testAccounts = testrig.NewTestAccounts()
suite.testTokens = testrig.NewTestTokens()
suite.db = testrig.NewTestDB()
suite.db = testrig.NewTestDB(&suite.state)
suite.state.DB = suite.db
suite.oauthServer = testrig.NewTestOauthServer(suite.db)
suite.streamProcessor = stream.New(suite.db, suite.oauthServer)
suite.streamProcessor = stream.New(&suite.state, suite.oauthServer)
testrig.StandardDBSetup(suite.db, suite.testAccounts)
}