mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2026-01-02 13:03:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
internal/processing/admin/admin.go
View file

@ -22,7 +22,6 @@ import (
"context"
"mime/multipart"
"github.com/sirupsen/logrus"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
@ -49,17 +48,15 @@ type processor struct {
mediaHandler media.Handler
fromClientAPI chan messages.FromClientAPI
db db.DB
log *logrus.Logger
}
// New returns a new admin processor.
func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, fromClientAPI chan messages.FromClientAPI, config *config.Config, log *logrus.Logger) Processor {
func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, fromClientAPI chan messages.FromClientAPI, config *config.Config) Processor {
return &processor{
tc: tc,
config: config,
mediaHandler: mediaHandler,
fromClientAPI: fromClientAPI,
db: db,
log: log,
}
}

2
internal/processing/admin/createdomainblock.go
View file

@ -87,7 +87,7 @@ func (p *processor) DomainBlockCreate(ctx context.Context, account *gtsmodel.Acc
// 2. Delete the instance account for that instance if it exists.
// 3. Select all accounts from this instance and pass them through the delete functionality of the processor.
func (p *processor) initiateDomainBlockSideEffects(ctx context.Context, account *gtsmodel.Account, block *gtsmodel.DomainBlock) {
l := p.log.WithFields(logrus.Fields{
l := logrus.WithFields(logrus.Fields{
"func": "domainBlockProcessSideEffects",
"domain": block.Domain,
})