mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 07:22:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

reference global logrus (#274)

Browse source 
* 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
This commit is contained in:
R. Aidan Campbell 2021-10-11 05:37:33 -07:00 • committed by GitHub
commit 083099a957
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
210 changed files with 506 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/text/common.go
View file

@ -21,6 +21,7 @@ package text
import (
"context"
"fmt"
"github.com/sirupsen/logrus"
"html"
"strings"
@ -100,7 +101,7 @@ func (f *formatter) ReplaceMentions(ctx context.Context, in string, mentions []*
if menchie.TargetAccount == nil {
a, err := f.db.GetAccountByID(ctx, menchie.TargetAccountID)
if err != nil {
f.log.Errorf("error getting account with id %s from the db: %s", menchie.TargetAccountID, err)
logrus.Errorf("error getting account with id %s from the db: %s", menchie.TargetAccountID, err)
return match
}
menchie.TargetAccount = a

3
internal/text/common_test.go
View file

@ -89,8 +89,7 @@ func (suite *CommonTestSuite) SetupSuite() {
func (suite *CommonTestSuite) SetupTest() {
suite.config = testrig.NewTestConfig()
suite.db = testrig.NewTestDB()
suite.log = testrig.NewTestLog()
suite.formatter = text.NewFormatter(suite.config, suite.db, suite.log)
suite.formatter = text.NewFormatter(suite.config, suite.db)
testrig.StandardDBSetup(suite.db, nil)
}

5
internal/text/formatter.go
View file

@ -21,7 +21,6 @@ package text
import (
"context"
"github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
@ -45,14 +44,12 @@ type Formatter interface {
type formatter struct {
cfg *config.Config
db db.DB
log *logrus.Logger
}
// NewFormatter returns a new Formatter interface for parsing statuses and other text input into nice html.
func NewFormatter(cfg *config.Config, db db.DB, log *logrus.Logger) Formatter {
func NewFormatter(cfg *config.Config, db db.DB) Formatter {
return &formatter{
cfg: cfg,
db: db,
log: log,
}
}

2
internal/text/formatter_test.go
View file

@ -19,7 +19,6 @@
package text_test
import (
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/suite"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
@ -33,7 +32,6 @@ type TextStandardTestSuite struct {
suite.Suite
config *config.Config
db db.DB
log *logrus.Logger
// standard suite models
testTokens map[string]*gtsmodel.Token

3
internal/text/link_test.go
View file

@ -84,8 +84,7 @@ func (suite *LinkTestSuite) SetupSuite() {
func (suite *LinkTestSuite) SetupTest() {
suite.config = testrig.NewTestConfig()
suite.db = testrig.NewTestDB()
suite.log = testrig.NewTestLog()
suite.formatter = text.NewFormatter(suite.config, suite.db, suite.log)
suite.formatter = text.NewFormatter(suite.config, suite.db)
testrig.StandardDBSetup(suite.db, nil)
}

3
internal/text/markdown_test.go
View file

@ -82,8 +82,7 @@ func (suite *MarkdownTestSuite) SetupSuite() {
func (suite *MarkdownTestSuite) SetupTest() {
suite.config = testrig.NewTestConfig()
suite.db = testrig.NewTestDB()
suite.log = testrig.NewTestLog()
suite.formatter = text.NewFormatter(suite.config, suite.db, suite.log)
suite.formatter = text.NewFormatter(suite.config, suite.db)
testrig.StandardDBSetup(suite.db, suite.testAccounts)
}

3
internal/text/plain_test.go
View file

@ -64,8 +64,7 @@ func (suite *PlainTestSuite) SetupSuite() {
func (suite *PlainTestSuite) SetupTest() {
suite.config = testrig.NewTestConfig()
suite.db = testrig.NewTestDB()
suite.log = testrig.NewTestLog()
suite.formatter = text.NewFormatter(suite.config, suite.db, suite.log)
suite.formatter = text.NewFormatter(suite.config, suite.db)
testrig.StandardDBSetup(suite.db, nil)
}