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> --- .../db/bundb/migrations/20220612091800_duplicated_media_cleanup.go | 6 +++--- internal/db/bundb/migrations/main.go | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'internal/db/bundb/migrations') diff --git a/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go b/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go index 1a3ae07aa..4c4ada594 100644 --- a/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go +++ b/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go @@ -26,14 +26,14 @@ import ( "codeberg.org/gruf/go-store/kv" "codeberg.org/gruf/go-store/storage" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/uptrace/bun" ) func init() { - deleteAttachment := func(ctx context.Context, l *logrus.Entry, a *gtsmodel.MediaAttachment, s *kv.KVStore, tx bun.Tx) { + deleteAttachment := func(ctx context.Context, l log.Entry, a *gtsmodel.MediaAttachment, s *kv.KVStore, tx bun.Tx) { if err := s.Delete(a.File.Path); err != nil && err != storage.ErrNotFound { l.Errorf("error removing file %s: %s", a.File.Path, err) } else { @@ -57,7 +57,7 @@ func init() { } up := func(ctx context.Context, db *bun.DB) error { - l := logrus.WithField("migration", "20220612091800_duplicated_media_cleanup") + l := log.WithField("migration", "20220612091800_duplicated_media_cleanup") if config.GetStorageBackend() != "local" { // this migration only affects versions which only supported local storage diff --git a/internal/db/bundb/migrations/main.go b/internal/db/bundb/migrations/main.go index 318f9be3f..af43856fe 100644 --- a/internal/db/bundb/migrations/main.go +++ b/internal/db/bundb/migrations/main.go @@ -22,7 +22,5 @@ import ( "github.com/uptrace/bun/migrate" ) -var ( - // Migrations provides migration logic for bun - Migrations = migrate.NewMigrations() -) +// Migrations provides migration logic for bun +var Migrations = migrate.NewMigrations() -- cgit v1.3