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/federation/federatingdb/util.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal/federation/federatingdb/util.go') diff --git a/internal/federation/federatingdb/util.go b/internal/federation/federatingdb/util.go index 49a95a449..3fd9653af 100644 --- a/internal/federation/federatingdb/util.go +++ b/internal/federation/federatingdb/util.go @@ -63,13 +63,13 @@ func sameActor(activityActor vocab.ActivityStreamsActorProperty, followActor voc // The go-fed library will handle setting the 'id' property on the // activity or object provided with the value returned. func (f *federatingDB) NewID(ctx context.Context, t vocab.Type) (idURL *url.URL, err error) { - l := f.log.WithFields( + l := logrus.WithFields( logrus.Fields{ "func": "NewID", }, ) - if f.log.Level >= logrus.DebugLevel { + if logrus.GetLevel() >= logrus.DebugLevel { i, err := marshalItem(t) if err != nil { return nil, err -- cgit v1.2.3