From add6eb6e2bb31b28882a5dc72ad143bccd712e99 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Fri, 27 Aug 2021 13:26:45 +0200 Subject: Gin logging (#165) * start messing around with logger * more messing about * fix error with instance not created on startup (#156) * set logger * log user agent * finalize logging * go fmt * start messing around with logger * more messing about * set logger * log user agent * finalize logging * go fmt --- testrig/db.go | 4 +--- testrig/log.go | 14 ++++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'testrig') diff --git a/testrig/db.go b/testrig/db.go index b0e2afd04..52a1af6e9 100644 --- a/testrig/db.go +++ b/testrig/db.go @@ -66,9 +66,7 @@ func NewTestDB() db.DB { config.DBConfig.Address = alternateAddress } - l := logrus.New() - l.SetLevel(logrus.TraceLevel) - testDB, err := bundb.NewBunDBService(context.Background(), config, l) + testDB, err := bundb.NewBunDBService(context.Background(), config, NewTestLog()) if err != nil { logrus.Panic(err) } diff --git a/testrig/log.go b/testrig/log.go index 0bafc96f7..062368e9c 100644 --- a/testrig/log.go +++ b/testrig/log.go @@ -18,11 +18,17 @@ package testrig -import "github.com/sirupsen/logrus" +import ( + "github.com/superseriousbusiness/gotosocial/internal/log" + + "github.com/sirupsen/logrus" +) // NewTestLog returns a trace level logger for testing func NewTestLog() *logrus.Logger { - log := logrus.New() - log.SetLevel(logrus.TraceLevel) - return log + logger, err := log.New("trace") + if err != nil { + panic(err) + } + return logger } -- cgit v1.2.3