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/timeline/manager.go | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'internal/timeline/manager.go') diff --git a/internal/timeline/manager.go b/internal/timeline/manager.go index 02a388aba..51bd65fbf 100644 --- a/internal/timeline/manager.go +++ b/internal/timeline/manager.go @@ -24,7 +24,8 @@ import ( "strings" "sync" - "github.com/sirupsen/logrus" + "codeberg.org/gruf/go-kv" + "github.com/superseriousbusiness/gotosocial/internal/log" ) const ( @@ -98,11 +99,11 @@ type manager struct { } func (m *manager) Ingest(ctx context.Context, item Timelineable, timelineAccountID string) (bool, error) { - l := logrus.WithFields(logrus.Fields{ - "func": "Ingest", - "timelineAccountID": timelineAccountID, - "itemID": item.GetID(), - }) + l := log.WithFields(kv.Fields{ + + {"timelineAccountID", timelineAccountID}, + {"itemID", item.GetID()}, + }...) t, err := m.getOrCreateTimeline(ctx, timelineAccountID) if err != nil { @@ -114,11 +115,11 @@ func (m *manager) Ingest(ctx context.Context, item Timelineable, timelineAccount } func (m *manager) IngestAndPrepare(ctx context.Context, item Timelineable, timelineAccountID string) (bool, error) { - l := logrus.WithFields(logrus.Fields{ - "func": "IngestAndPrepare", - "timelineAccountID": timelineAccountID, - "itemID": item.GetID(), - }) + l := log.WithFields(kv.Fields{ + + {"timelineAccountID", timelineAccountID}, + {"itemID", item.GetID()}, + }...) t, err := m.getOrCreateTimeline(ctx, timelineAccountID) if err != nil { @@ -130,11 +131,11 @@ func (m *manager) IngestAndPrepare(ctx context.Context, item Timelineable, timel } func (m *manager) Remove(ctx context.Context, timelineAccountID string, itemID string) (int, error) { - l := logrus.WithFields(logrus.Fields{ - "func": "Remove", - "timelineAccountID": timelineAccountID, - "itemID": itemID, - }) + l := log.WithFields(kv.Fields{ + + {"timelineAccountID", timelineAccountID}, + {"itemID", itemID}, + }...) t, err := m.getOrCreateTimeline(ctx, timelineAccountID) if err != nil { @@ -146,10 +147,10 @@ func (m *manager) Remove(ctx context.Context, timelineAccountID string, itemID s } func (m *manager) GetTimeline(ctx context.Context, timelineAccountID string, maxID string, sinceID string, minID string, limit int, local bool) ([]Preparable, error) { - l := logrus.WithFields(logrus.Fields{ - "func": "GetTimeline", - "timelineAccountID": timelineAccountID, - }) + l := log.WithFields(kv.Fields{ + + {"timelineAccountID", timelineAccountID}, + }...) t, err := m.getOrCreateTimeline(ctx, timelineAccountID) if err != nil { -- cgit v1.2.3