diff options
| author |  R. Aidan Campbell <raidancampbell@users.noreply.github.com> | 2021-10-11 05:37:33 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-10-11 14:37:33 +0200 |
| commit | 083099a9575f8b2fac22c1d4a51a9dd0e2201243 (patch) | |
| tree | d1787aa544679c433f797d2313ce532250fe574f /internal/visibility | |
| parent | Handle forwarded messages (#273) (diff) | |
| download | gotosocial-083099a9575f8b2fac22c1d4a51a9dd0e2201243.tar.xz | |
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
Diffstat (limited to 'internal/visibility')
| -rw-r--r-- | internal/visibility/filter.go | 7 | ||||
| -rw-r--r-- | internal/visibility/statushometimelineable.go | 2 | ||||
| -rw-r--r-- | internal/visibility/statuspublictimelineable.go | 2 | ||||
| -rw-r--r-- | internal/visibility/statusvisible.go | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/internal/visibility/filter.go b/internal/visibility/filter.go index 644e85b35..b5f49c831 100644 --- a/internal/visibility/filter.go +++ b/internal/visibility/filter.go @@ -21,7 +21,6 @@ package visibility import ( "context" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) @@ -46,13 +45,11 @@ type Filter interface { type filter struct { db db.DB - log *logrus.Logger } -// NewFilter returns a new Filter interface that will use the provided database and logger. -func NewFilter(db db.DB, log *logrus.Logger) Filter { +// NewFilter returns a new Filter interface that will use the provided database. +func NewFilter(db db.DB) Filter { return &filter{ db: db, - log: log, } } diff --git a/internal/visibility/statushometimelineable.go b/internal/visibility/statushometimelineable.go index dd0ca079b..3bc23dfcf 100644 --- a/internal/visibility/statushometimelineable.go +++ b/internal/visibility/statushometimelineable.go @@ -27,7 +27,7 @@ import ( ) func (f *filter) StatusHometimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) { - l := f.log.WithFields(logrus.Fields{ + l := logrus.WithFields(logrus.Fields{ "func": "StatusHometimelineable", "statusID": targetStatus.ID, }) diff --git a/internal/visibility/statuspublictimelineable.go b/internal/visibility/statuspublictimelineable.go index b815ac309..8dc1e9f5f 100644 --- a/internal/visibility/statuspublictimelineable.go +++ b/internal/visibility/statuspublictimelineable.go @@ -27,7 +27,7 @@ import ( ) func (f *filter) StatusPublictimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) { - l := f.log.WithFields(logrus.Fields{ + l := logrus.WithFields(logrus.Fields{ "func": "StatusPublictimelineable", "statusID": targetStatus.ID, }) diff --git a/internal/visibility/statusvisible.go b/internal/visibility/statusvisible.go index fc306411a..1e48abcda 100644 --- a/internal/visibility/statusvisible.go +++ b/internal/visibility/statusvisible.go @@ -30,7 +30,7 @@ import ( func (f *filter) StatusVisible(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (bool, error) { const getBoosted = true - l := f.log.WithFields(logrus.Fields{ + l := logrus.WithFields(logrus.Fields{ "func": "StatusVisible", "statusID": targetStatus.ID, }) |