diff options
Diffstat (limited to 'internal/processing/admin')
| -rw-r--r-- | internal/processing/admin/createdomainblock.go | 11 | ||||
| -rw-r--r-- | internal/processing/admin/importdomainblocks.go | 2 | ||||
| -rw-r--r-- | internal/processing/admin/mediaprune.go | 14 |
3 files changed, 13 insertions, 14 deletions
diff --git a/internal/processing/admin/createdomainblock.go b/internal/processing/admin/createdomainblock.go index 1c641950c..b42445380 100644 --- a/internal/processing/admin/createdomainblock.go +++ b/internal/processing/admin/createdomainblock.go @@ -24,13 +24,14 @@ import ( "strings" "time" - "github.com/sirupsen/logrus" + "codeberg.org/gruf/go-kv" "github.com/superseriousbusiness/gotosocial/internal/ap" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/text" ) @@ -90,10 +91,10 @@ 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 := logrus.WithFields(logrus.Fields{ - "func": "domainBlockProcessSideEffects", - "domain": block.Domain, - }) + l := log.WithFields(kv.Fields{ + + {"domain", block.Domain}, + }...) l.Debug("processing domain block side effects") diff --git a/internal/processing/admin/importdomainblocks.go b/internal/processing/admin/importdomainblocks.go index b78589b8a..57235a5b8 100644 --- a/internal/processing/admin/importdomainblocks.go +++ b/internal/processing/admin/importdomainblocks.go @@ -34,7 +34,6 @@ import ( // DomainBlocksImport handles the import of a bunch of domain blocks at once, by calling the DomainBlockCreate function for each domain in the provided file. func (p *processor) DomainBlocksImport(ctx context.Context, account *gtsmodel.Account, domains *multipart.FileHeader) ([]*apimodel.DomainBlock, gtserror.WithCode) { - f, err := domains.Open() if err != nil { return nil, gtserror.NewErrorBadRequest(fmt.Errorf("DomainBlocksImport: error opening attachment: %s", err)) @@ -56,7 +55,6 @@ func (p *processor) DomainBlocksImport(ctx context.Context, account *gtsmodel.Ac blocks := []*apimodel.DomainBlock{} for _, d := range d { block, err := p.DomainBlockCreate(ctx, account, d.Domain.Domain, false, d.PublicComment, "", "") - if err != nil { return nil, err } diff --git a/internal/processing/admin/mediaprune.go b/internal/processing/admin/mediaprune.go index 1c3398b78..40652c3ca 100644 --- a/internal/processing/admin/mediaprune.go +++ b/internal/processing/admin/mediaprune.go @@ -22,8 +22,8 @@ import ( "context" "fmt" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/log" ) func (p *processor) MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gtserror.WithCode { @@ -35,27 +35,27 @@ func (p *processor) MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gt go func() { pruned, err := p.mediaManager.PruneAllRemote(ctx, mediaRemoteCacheDays) if err != nil { - logrus.Errorf("MediaPrune: error pruning remote cache: %s", err) + log.Errorf("MediaPrune: error pruning remote cache: %s", err) } else { - logrus.Infof("MediaPrune: pruned %d remote cache entries", pruned) + log.Infof("MediaPrune: pruned %d remote cache entries", pruned) } }() go func() { pruned, err := p.mediaManager.PruneUnusedLocalAttachments(ctx) if err != nil { - logrus.Errorf("MediaPrune: error pruning unused local cache: %s", err) + log.Errorf("MediaPrune: error pruning unused local cache: %s", err) } else { - logrus.Infof("MediaPrune: pruned %d unused local cache entries", pruned) + log.Infof("MediaPrune: pruned %d unused local cache entries", pruned) } }() go func() { pruned, err := p.mediaManager.PruneAllMeta(ctx) if err != nil { - logrus.Errorf("MediaPrune: error pruning meta: %s", err) + log.Errorf("MediaPrune: error pruning meta: %s", err) } else { - logrus.Infof("MediaPrune: pruned %d meta entries", pruned) + log.Infof("MediaPrune: pruned %d meta entries", pruned) } }() |