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> --- testrig/db.go | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'testrig/db.go') diff --git a/testrig/db.go b/testrig/db.go index b4c05d727..ae3132835 100644 --- a/testrig/db.go +++ b/testrig/db.go @@ -23,11 +23,11 @@ import ( "os" "strconv" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/db/bundb" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/log" ) var testModels = []interface{}{ @@ -91,7 +91,7 @@ func NewTestDB() db.DB { testDB, err := bundb.NewBunDBService(context.Background()) if err != nil { - logrus.Panic(err) + log.Panic(err) } return testDB } @@ -101,7 +101,7 @@ func CreateTestTables(db db.DB) { ctx := context.Background() for _, m := range testModels { if err := db.CreateTable(ctx, m); err != nil { - logrus.Panicf("error creating table for %+v: %s", m, err) + log.Panicf("error creating table for %+v: %s", m, err) } } } @@ -116,7 +116,7 @@ func CreateTestTables(db db.DB) { // verification will fail. func StandardDBSetup(db db.DB, accounts map[string]*gtsmodel.Account) { if db == nil { - logrus.Panic("db setup: db was nil") + log.Panic("db setup: db was nil") } CreateTestTables(db) @@ -125,128 +125,128 @@ func StandardDBSetup(db db.DB, accounts map[string]*gtsmodel.Account) { for _, v := range NewTestTokens() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestClients() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestApplications() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestBlocks() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestDomainBlocks() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestInstances() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestUsers() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } if accounts == nil { for _, v := range NewTestAccounts() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } } else { for _, v := range accounts { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } } for _, v := range NewTestAttachments() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestStatuses() { if err := db.PutStatus(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestEmojis() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestTags() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestMentions() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestFaves() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestFollows() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } for _, v := range NewTestNotifications() { if err := db.Put(ctx, v); err != nil { - logrus.Panic(err) + log.Panic(err) } } if err := db.CreateInstanceAccount(ctx); err != nil { - logrus.Panic(err) + log.Panic(err) } if err := db.CreateInstanceInstance(ctx); err != nil { - logrus.Panic(err) + log.Panic(err) } - logrus.Debug("testing db setup complete") + log.Debug("testing db setup complete") } // StandardDBTeardown drops all the standard testing tables/models from the database to ensure it's clean for the next test. func StandardDBTeardown(db db.DB) { ctx := context.Background() if db == nil { - logrus.Panic("db teardown: db was nil") + log.Panic("db teardown: db was nil") } for _, m := range testModels { if err := db.DropTable(ctx, m); err != nil { - logrus.Panic(err) + log.Panic(err) } } } -- cgit v1.2.3