From 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 19 Jul 2022 09:47:55 +0100 Subject: [chore] use our own logging implementation (#716) * first commit Signed-off-by: kim * replace logging with our own log library Signed-off-by: kim * fix imports Signed-off-by: kim * fix log imports Signed-off-by: kim * add license text Signed-off-by: kim * fix package import cycle between config and log package Signed-off-by: kim * fix empty kv.Fields{} being passed to WithFields() Signed-off-by: kim * fix uses of log.WithFields() with whitespace issues and empty slices Signed-off-by: kim * *linter related grumbling* Signed-off-by: kim * gofmt the codebase! also fix more log.WithFields() formatting issues Signed-off-by: kim * update testrig code to match new changes Signed-off-by: kim * fix error wrapping in non fmt.Errorf function Signed-off-by: kim * add benchmarking of log.Caller() vs non-cached Signed-off-by: kim * fix syslog tests, add standard build tags to test runner to ensure consistency Signed-off-by: kim * make syslog tests more robust Signed-off-by: kim * fix caller depth arithmatic (is that how you spell it?) Signed-off-by: kim * update to use unkeyed fields in kv.Field{} instances Signed-off-by: kim * update go-kv library Signed-off-by: kim * update libraries list Signed-off-by: kim * fuck you linter get nerfed Signed-off-by: kim Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com> --- internal/federation/dereferencing/thread.go | 33 +++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'internal/federation/dereferencing/thread.go') diff --git a/internal/federation/dereferencing/thread.go b/internal/federation/dereferencing/thread.go index a299c1220..7d7431110 100644 --- a/internal/federation/dereferencing/thread.go +++ b/internal/federation/dereferencing/thread.go @@ -23,9 +23,10 @@ import ( "fmt" "net/url" - "github.com/sirupsen/logrus" + "codeberg.org/gruf/go-kv" "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/uris" ) @@ -36,11 +37,11 @@ import ( // presented by remote instances as part of their replies collections, and will likely involve making several calls to // multiple different hosts. func (d *deref) DereferenceThread(ctx context.Context, username string, statusIRI *url.URL) error { - l := logrus.WithFields(logrus.Fields{ - "func": "DereferenceThread", - "username": username, - "statusIRI": statusIRI.String(), - }) + l := log.WithFields(kv.Fields{ + + {"username", username}, + {"statusIRI", statusIRI}, + }...) l.Trace("entering DereferenceThread") // if it's our status we already have everything stashed so we can bail early @@ -70,11 +71,11 @@ func (d *deref) DereferenceThread(ctx context.Context, username string, statusIR // iterateAncestors has the goal of reaching the oldest ancestor of a given status, and stashing all statuses along the way. func (d *deref) iterateAncestors(ctx context.Context, username string, statusIRI url.URL) error { - l := logrus.WithFields(logrus.Fields{ - "func": "iterateAncestors", - "username": username, - "statusIRI": statusIRI.String(), - }) + l := log.WithFields(kv.Fields{ + + {"username", username}, + {"statusIRI", statusIRI}, + }...) l.Trace("entering iterateAncestors") // if it's our status we don't need to dereference anything so we can immediately move up the chain @@ -123,11 +124,11 @@ func (d *deref) iterateAncestors(ctx context.Context, username string, statusIRI } func (d *deref) iterateDescendants(ctx context.Context, username string, statusIRI url.URL, statusable ap.Statusable) error { - l := logrus.WithFields(logrus.Fields{ - "func": "iterateDescendants", - "username": username, - "statusIRI": statusIRI.String(), - }) + l := log.WithFields(kv.Fields{ + + {"username", username}, + {"statusIRI", statusIRI}, + }...) l.Trace("entering iterateDescendants") // if it's our status we already have descendants stashed so we can bail early -- cgit v1.2.3