From 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 19 Jul 2022 09:47:55 +0100 Subject: [chore] use our own logging implementation (#716) * first commit Signed-off-by: kim * replace logging with our own log library Signed-off-by: kim * fix imports Signed-off-by: kim * fix log imports Signed-off-by: kim * add license text Signed-off-by: kim * fix package import cycle between config and log package Signed-off-by: kim * fix empty kv.Fields{} being passed to WithFields() Signed-off-by: kim * fix uses of log.WithFields() with whitespace issues and empty slices Signed-off-by: kim * *linter related grumbling* Signed-off-by: kim * gofmt the codebase! also fix more log.WithFields() formatting issues Signed-off-by: kim * update testrig code to match new changes Signed-off-by: kim * fix error wrapping in non fmt.Errorf function Signed-off-by: kim * add benchmarking of log.Caller() vs non-cached Signed-off-by: kim * fix syslog tests, add standard build tags to test runner to ensure consistency Signed-off-by: kim * make syslog tests more robust Signed-off-by: kim * fix caller depth arithmatic (is that how you spell it?) Signed-off-by: kim * update to use unkeyed fields in kv.Field{} instances Signed-off-by: kim * update go-kv library Signed-off-by: kim * update libraries list Signed-off-by: kim * fuck you linter get nerfed Signed-off-by: kim Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com> --- internal/processing/admin/mediaprune.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'internal/processing/admin/mediaprune.go') 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) } }() -- cgit v1.2.3