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/processing/status/util.go | 6 +++--- internal/processing/status/util_test.go | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'internal/processing/status') diff --git a/internal/processing/status/util.go b/internal/processing/status/util.go index 79c416f98..52214e95f 100644 --- a/internal/processing/status/util.go +++ b/internal/processing/status/util.go @@ -23,11 +23,11 @@ import ( "errors" "fmt" - "github.com/sirupsen/logrus" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/util" ) @@ -204,12 +204,12 @@ func (p *processor) ProcessMentions(ctx context.Context, form *apimodel.Advanced for _, mentionedAccountName := range mentionedAccountNames { gtsMention, err := p.parseMention(ctx, mentionedAccountName, accountID, status.ID) if err != nil { - logrus.Errorf("ProcessMentions: error parsing mention %s from status: %s", mentionedAccountName, err) + log.Errorf("ProcessMentions: error parsing mention %s from status: %s", mentionedAccountName, err) continue } if err := p.db.Put(ctx, gtsMention); err != nil { - logrus.Errorf("ProcessMentions: error putting mention in db: %s", err) + log.Errorf("ProcessMentions: error putting mention in db: %s", err) } mentions = append(mentions, gtsMention) diff --git a/internal/processing/status/util_test.go b/internal/processing/status/util_test.go index 80c2da897..f1b826bd0 100644 --- a/internal/processing/status/util_test.go +++ b/internal/processing/status/util_test.go @@ -34,8 +34,11 @@ const statusText1 = `Another test @foss_satan@fossbros-anonymous.io #Hashtag Text` -const statusText1ExpectedFull = "

Another test @foss_satan

#Hashtag

Text

" -const statusText1ExpectedPartial = "

Another test @foss_satan

#Hashtag

Text

" + +const ( + statusText1ExpectedFull = "

Another test @foss_satan

#Hashtag

Text

" + statusText1ExpectedPartial = "

Another test @foss_satan

#Hashtag

Text

" +) const statusText2 = `Another test @foss_satan@fossbros-anonymous.io @@ -97,7 +100,6 @@ func (suite *UtilTestSuite) TestProcessMentions1() { } func (suite *UtilTestSuite) TestProcessContentFull1() { - /* TEST PREPARATION */ @@ -146,7 +148,6 @@ func (suite *UtilTestSuite) TestProcessContentFull1() { } func (suite *UtilTestSuite) TestProcessContentPartial1() { - /* TEST PREPARATION */ @@ -238,7 +239,6 @@ func (suite *UtilTestSuite) TestProcessMentions2() { } func (suite *UtilTestSuite) TestProcessContentFull2() { - /* TEST PREPARATION */ @@ -288,7 +288,6 @@ func (suite *UtilTestSuite) TestProcessContentFull2() { } func (suite *UtilTestSuite) TestProcessContentPartial2() { - /* TEST PREPARATION */ -- cgit v1.2.3