From 083099a9575f8b2fac22c1d4a51a9dd0e2201243 Mon Sep 17 00:00:00 2001 From: "R. Aidan Campbell" Date: Mon, 11 Oct 2021 05:37:33 -0700 Subject: reference global logrus (#274) * reference logrus' global logger instead of passing and storing a logger reference everywhere * always directly use global logrus logger instead of referencing an instance * test suites should also directly use the global logrus logger * rename gin logging function to clarify that it's middleware * correct comments which erroneously referenced removed logger parameter * setting log level for tests now uses logrus' exported type instead of the string value, to guarantee error isn't possible --- internal/typeutils/converter_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'internal/typeutils/converter_test.go') diff --git a/internal/typeutils/converter_test.go b/internal/typeutils/converter_test.go index 424b0de29..041182369 100644 --- a/internal/typeutils/converter_test.go +++ b/internal/typeutils/converter_test.go @@ -20,7 +20,6 @@ package typeutils_test import ( "github.com/go-fed/activity/streams/vocab" - "github.com/sirupsen/logrus" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" @@ -327,7 +326,6 @@ type TypeUtilsTestSuite struct { suite.Suite config *config.Config db db.DB - log *logrus.Logger testAccounts map[string]*gtsmodel.Account testStatuses map[string]*gtsmodel.Status testPeople map[string]vocab.ActivityStreamsPerson @@ -338,11 +336,11 @@ type TypeUtilsTestSuite struct { func (suite *TypeUtilsTestSuite) SetupSuite() { suite.config = testrig.NewTestConfig() suite.db = testrig.NewTestDB() - suite.log = testrig.NewTestLog() + testrig.InitTestLog() suite.testAccounts = testrig.NewTestAccounts() suite.testStatuses = testrig.NewTestStatuses() suite.testPeople = testrig.NewTestFediPeople() - suite.typeconverter = typeutils.NewConverter(suite.config, suite.db, suite.log) + suite.typeconverter = typeutils.NewConverter(suite.config, suite.db) } func (suite *TypeUtilsTestSuite) SetupTest() { -- cgit v1.2.3