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/timeline/timeline.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'internal/timeline/timeline.go') diff --git a/internal/timeline/timeline.go b/internal/timeline/timeline.go index 5f5fa1b4f..12c36a7f0 100644 --- a/internal/timeline/timeline.go +++ b/internal/timeline/timeline.go @@ -23,7 +23,6 @@ import ( "sync" "time" - "github.com/sirupsen/logrus" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" @@ -134,12 +133,11 @@ type timeline struct { db db.DB filter visibility.Filter tc typeutils.TypeConverter - log *logrus.Logger sync.Mutex } // NewTimeline returns a new Timeline for the given account ID -func NewTimeline(ctx context.Context, accountID string, db db.DB, typeConverter typeutils.TypeConverter, log *logrus.Logger) (Timeline, error) { +func NewTimeline(ctx context.Context, accountID string, db db.DB, typeConverter typeutils.TypeConverter) (Timeline, error) { timelineOwnerAccount := >smodel.Account{} if err := db.GetByID(ctx, accountID, timelineOwnerAccount); err != nil { return nil, err @@ -151,9 +149,8 @@ func NewTimeline(ctx context.Context, accountID string, db db.DB, typeConverter accountID: accountID, account: timelineOwnerAccount, db: db, - filter: visibility.NewFilter(db, log), + filter: visibility.NewFilter(db), tc: typeConverter, - log: log, }, nil } -- cgit v1.2.3