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/transport/derefinstance.go | |
| 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/transport/derefinstance.go')
| -rw-r--r-- | internal/transport/derefinstance.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/internal/transport/derefinstance.go b/internal/transport/derefinstance.go index 673881b05..a2610f54a 100644 --- a/internal/transport/derefinstance.go +++ b/internal/transport/derefinstance.go @@ -23,6 +23,7 @@ import ( "encoding/json" "errors" "fmt" + "github.com/sirupsen/logrus" "io/ioutil" "net/http" "net/url" @@ -36,7 +37,7 @@ import ( ) func (t *transport) DereferenceInstance(ctx context.Context, iri *url.URL) (*gtsmodel.Instance, error) { - l := t.log.WithField("func", "DereferenceInstance") + l := logrus.WithField("func", "DereferenceInstance") var i *gtsmodel.Instance var err error @@ -78,7 +79,7 @@ func (t *transport) DereferenceInstance(ctx context.Context, iri *url.URL) (*gts } func dereferenceByAPIV1Instance(ctx context.Context, t *transport, iri *url.URL) (*gtsmodel.Instance, error) { - l := t.log.WithField("func", "dereferenceByAPIV1Instance") + l := logrus.WithField("func", "dereferenceByAPIV1Instance") cleanIRI := &url.URL{ Scheme: iri.Scheme, @@ -235,7 +236,7 @@ func dereferenceByNodeInfo(c context.Context, t *transport, iri *url.URL) (*gtsm } func callNodeInfoWellKnown(ctx context.Context, t *transport, iri *url.URL) (*url.URL, error) { - l := t.log.WithField("func", "callNodeInfoWellKnown") + l := logrus.WithField("func", "callNodeInfoWellKnown") cleanIRI := &url.URL{ Scheme: iri.Scheme, @@ -300,7 +301,7 @@ func callNodeInfoWellKnown(ctx context.Context, t *transport, iri *url.URL) (*ur } func callNodeInfo(ctx context.Context, t *transport, iri *url.URL) (*apimodel.Nodeinfo, error) { - l := t.log.WithField("func", "callNodeInfo") + l := logrus.WithField("func", "callNodeInfo") l.Debugf("performing GET to %s", iri.String()) req, err := http.NewRequestWithContext(ctx, "GET", iri.String(), nil) |