summaryrefslogtreecommitdiff
path: root/internal/federation/federatingdb
diff options
context:
space:
mode:
Diffstat (limited to 'internal/federation/federatingdb')
-rw-r--r--internal/federation/federatingdb/accept.go4
-rw-r--r--internal/federation/federatingdb/announce.go4
-rw-r--r--internal/federation/federatingdb/create.go6
-rw-r--r--internal/federation/federatingdb/db.go9
-rw-r--r--internal/federation/federatingdb/delete.go2
-rw-r--r--internal/federation/federatingdb/exists.go2
-rw-r--r--internal/federation/federatingdb/federatingdb_test.go4
-rw-r--r--internal/federation/federatingdb/followers.go2
-rw-r--r--internal/federation/federatingdb/following.go2
-rw-r--r--internal/federation/federatingdb/get.go2
-rw-r--r--internal/federation/federatingdb/owns.go2
-rw-r--r--internal/federation/federatingdb/undo.go4
-rw-r--r--internal/federation/federatingdb/update.go4
-rw-r--r--internal/federation/federatingdb/util.go4
14 files changed, 23 insertions, 28 deletions
diff --git a/internal/federation/federatingdb/accept.go b/internal/federation/federatingdb/accept.go
index 0d2d3a270..8d295161c 100644
--- a/internal/federation/federatingdb/accept.go
+++ b/internal/federation/federatingdb/accept.go
@@ -33,13 +33,13 @@ import (
)
func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsAccept) error {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Accept",
},
)
- if f.log.Level >= logrus.DebugLevel {
+ if logrus.GetLevel() >= logrus.DebugLevel {
i, err := marshalItem(accept)
if err != nil {
return err
diff --git a/internal/federation/federatingdb/announce.go b/internal/federation/federatingdb/announce.go
index 49ec84509..7a40cd051 100644
--- a/internal/federation/federatingdb/announce.go
+++ b/internal/federation/federatingdb/announce.go
@@ -29,13 +29,13 @@ import (
)
func (f *federatingDB) Announce(ctx context.Context, announce vocab.ActivityStreamsAnnounce) error {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Announce",
},
)
- if f.log.Level >= logrus.DebugLevel {
+ if logrus.GetLevel() >= logrus.DebugLevel {
i, err := marshalItem(announce)
if err != nil {
return err
diff --git a/internal/federation/federatingdb/create.go b/internal/federation/federatingdb/create.go
index 4262dfcb4..862f84473 100644
--- a/internal/federation/federatingdb/create.go
+++ b/internal/federation/federatingdb/create.go
@@ -46,13 +46,13 @@ import (
// Under certain conditions and network activities, Create may be called
// multiple times for the same ActivityStreams object.
func (f *federatingDB) Create(ctx context.Context, asType vocab.Type) error {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Create",
},
)
- if f.log.Level >= logrus.DebugLevel {
+ if logrus.GetLevel() >= logrus.DebugLevel {
i, err := marshalItem(asType)
if err != nil {
return err
@@ -169,7 +169,7 @@ func (f *federatingDB) activityCreate(ctx context.Context, asType vocab.Type, re
// createNote handles a Create activity with a Note type.
func (f *federatingDB) createNote(ctx context.Context, note vocab.ActivityStreamsNote, receivingAccount *gtsmodel.Account, requestingAccount *gtsmodel.Account, fromFederatorChan chan messages.FromFederator) error {
- l := f.log.WithFields(logrus.Fields{
+ l := logrus.WithFields(logrus.Fields{
"func": "createNote",
"receivingAccount": receivingAccount.URI,
"requestingAccount": requestingAccount.URI,
diff --git a/internal/federation/federatingdb/db.go b/internal/federation/federatingdb/db.go
index 8d41d082e..039c70168 100644
--- a/internal/federation/federatingdb/db.go
+++ b/internal/federation/federatingdb/db.go
@@ -25,7 +25,6 @@ import (
"github.com/go-fed/activity/pub"
"github.com/go-fed/activity/streams/vocab"
- "github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
@@ -47,20 +46,18 @@ type federatingDB struct {
pool sync.Pool
db db.DB
config *config.Config
- log *logrus.Logger
typeConverter typeutils.TypeConverter
}
-// New returns a DB interface using the given database, config, and logger.
-func New(db db.DB, config *config.Config, log *logrus.Logger) DB {
+// New returns a DB interface using the given database and config
+func New(db db.DB, config *config.Config) DB {
fdb := federatingDB{
mutex: sync.Mutex{},
locks: make(map[string]*mutex, 100),
pool: sync.Pool{New: func() interface{} { return &mutex{} }},
db: db,
config: config,
- log: log,
- typeConverter: typeutils.NewConverter(config, db, log),
+ typeConverter: typeutils.NewConverter(config, db),
}
go fdb.cleanupLocks()
return &fdb
diff --git a/internal/federation/federatingdb/delete.go b/internal/federation/federatingdb/delete.go
index 77c3f502b..7d41d1b76 100644
--- a/internal/federation/federatingdb/delete.go
+++ b/internal/federation/federatingdb/delete.go
@@ -36,7 +36,7 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Delete(ctx context.Context, id *url.URL) error {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Delete",
"id": id,
diff --git a/internal/federation/federatingdb/exists.go b/internal/federation/federatingdb/exists.go
index ec5599c24..01c14a720 100644
--- a/internal/federation/federatingdb/exists.go
+++ b/internal/federation/federatingdb/exists.go
@@ -32,7 +32,7 @@ import (
//
// Implementation note: this just straight up isn't implemented, and doesn't *really* need to be either.
func (f *federatingDB) Exists(c context.Context, id *url.URL) (exists bool, err error) {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Exists",
"id": id,
diff --git a/internal/federation/federatingdb/federatingdb_test.go b/internal/federation/federatingdb/federatingdb_test.go
index 3c22480f7..9198266eb 100644
--- a/internal/federation/federatingdb/federatingdb_test.go
+++ b/internal/federation/federatingdb/federatingdb_test.go
@@ -21,7 +21,6 @@ package federatingdb_test
import (
"context"
- "github.com/sirupsen/logrus"
"github.com/stretchr/testify/suite"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
@@ -37,7 +36,6 @@ type FederatingDBTestSuite struct {
suite.Suite
config *config.Config
db db.DB
- log *logrus.Logger
tc typeutils.TypeConverter
federatingDB federatingdb.DB
@@ -68,7 +66,7 @@ func (suite *FederatingDBTestSuite) SetupTest() {
suite.config = testrig.NewTestConfig()
suite.db = testrig.NewTestDB()
suite.tc = testrig.NewTestTypeConverter(suite.db)
- suite.log = testrig.NewTestLog()
+ testrig.InitTestLog()
suite.federatingDB = testrig.NewTestFederatingDB(suite.db)
testrig.StandardDBSetup(suite.db, suite.testAccounts)
}
diff --git a/internal/federation/federatingdb/followers.go b/internal/federation/federatingdb/followers.go
index 61c5d4287..2eccf167d 100644
--- a/internal/federation/federatingdb/followers.go
+++ b/internal/federation/federatingdb/followers.go
@@ -17,7 +17,7 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Followers(ctx context.Context, actorIRI *url.URL) (followers vocab.ActivityStreamsCollection, err error) {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Followers",
"id": actorIRI,
diff --git a/internal/federation/federatingdb/following.go b/internal/federation/federatingdb/following.go
index 2cc024832..cc6111715 100644
--- a/internal/federation/federatingdb/following.go
+++ b/internal/federation/federatingdb/following.go
@@ -17,7 +17,7 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Following(ctx context.Context, actorIRI *url.URL) (following vocab.ActivityStreamsCollection, err error) {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Following",
"id": actorIRI,
diff --git a/internal/federation/federatingdb/get.go b/internal/federation/federatingdb/get.go
index 505891ca4..6c629d717 100644
--- a/internal/federation/federatingdb/get.go
+++ b/internal/federation/federatingdb/get.go
@@ -32,7 +32,7 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Get(ctx context.Context, id *url.URL) (value vocab.Type, err error) {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Get",
"id": id,
diff --git a/internal/federation/federatingdb/owns.go b/internal/federation/federatingdb/owns.go
index 04a417490..8846c52bb 100644
--- a/internal/federation/federatingdb/owns.go
+++ b/internal/federation/federatingdb/owns.go
@@ -33,7 +33,7 @@ import (
// the database has an entry for the IRI.
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Owns(ctx context.Context, id *url.URL) (bool, error) {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Owns",
"id": id,
diff --git a/internal/federation/federatingdb/undo.go b/internal/federation/federatingdb/undo.go
index 3d4cb1d53..934b5970d 100644
--- a/internal/federation/federatingdb/undo.go
+++ b/internal/federation/federatingdb/undo.go
@@ -31,13 +31,13 @@ import (
)
func (f *federatingDB) Undo(ctx context.Context, undo vocab.ActivityStreamsUndo) error {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Undo",
},
)
- if f.log.Level >= logrus.DebugLevel {
+ if logrus.GetLevel() >= logrus.DebugLevel {
i, err := marshalItem(undo)
if err != nil {
return err
diff --git a/internal/federation/federatingdb/update.go b/internal/federation/federatingdb/update.go
index b3a27b462..646b155dc 100644
--- a/internal/federation/federatingdb/update.go
+++ b/internal/federation/federatingdb/update.go
@@ -41,13 +41,13 @@ import (
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Update(ctx context.Context, asType vocab.Type) error {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "Update",
},
)
- if f.log.Level >= logrus.DebugLevel {
+ if logrus.GetLevel() >= logrus.DebugLevel {
i, err := marshalItem(asType)
if err != nil {
return err
diff --git a/internal/federation/federatingdb/util.go b/internal/federation/federatingdb/util.go
index 49a95a449..3fd9653af 100644
--- a/internal/federation/federatingdb/util.go
+++ b/internal/federation/federatingdb/util.go
@@ -63,13 +63,13 @@ func sameActor(activityActor vocab.ActivityStreamsActorProperty, followActor voc
// The go-fed library will handle setting the 'id' property on the
// activity or object provided with the value returned.
func (f *federatingDB) NewID(ctx context.Context, t vocab.Type) (idURL *url.URL, err error) {
- l := f.log.WithFields(
+ l := logrus.WithFields(
logrus.Fields{
"func": "NewID",
},
)
- if f.log.Level >= logrus.DebugLevel {
+ if logrus.GetLevel() >= logrus.DebugLevel {
i, err := marshalItem(t)
if err != nil {
return nil, err
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-02 16:04:35 +0000