diff options
Diffstat (limited to 'internal/federation/federatingdb')
| -rw-r--r-- | internal/federation/federatingdb/db.go | 3 | ||||
| -rw-r--r-- | internal/federation/federatingdb/lock.go | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/internal/federation/federatingdb/db.go b/internal/federation/federatingdb/db.go index c412ba3f8..8e98dc2f2 100644 --- a/internal/federation/federatingdb/db.go +++ b/internal/federation/federatingdb/db.go @@ -20,7 +20,6 @@ package federatingdb import ( "context" - "codeberg.org/gruf/go-mutexes" "github.com/superseriousbusiness/activity/pub" "github.com/superseriousbusiness/activity/streams/vocab" "github.com/superseriousbusiness/gotosocial/internal/state" @@ -40,7 +39,6 @@ type DB interface { // FederatingDB uses the underlying DB interface to implement the go-fed pub.Database interface. // It doesn't care what the underlying implementation of the DB interface is, as long as it works. type federatingDB struct { - locks mutexes.MutexMap state *state.State converter *typeutils.Converter } @@ -48,7 +46,6 @@ type federatingDB struct { // New returns a DB interface using the given database and config func New(state *state.State, converter *typeutils.Converter) DB { fdb := federatingDB{ - locks: mutexes.NewMap(-1, -1), // use defaults state: state, converter: converter, } diff --git a/internal/federation/federatingdb/lock.go b/internal/federation/federatingdb/lock.go index 900a282af..5353aea91 100644 --- a/internal/federation/federatingdb/lock.go +++ b/internal/federation/federatingdb/lock.go @@ -19,7 +19,6 @@ package federatingdb import ( "context" - "errors" "net/url" ) @@ -35,9 +34,5 @@ import ( // // Used to ensure race conditions in multiple requests do not occur. func (f *federatingDB) Lock(c context.Context, id *url.URL) (func(), error) { - if id == nil { - return nil, errors.New("Lock: id was nil") - } - unlock := f.locks.Lock(id.String()) - return unlock, nil + return f.state.FedLocks.Lock("federatingDB " + id.String()), nil // id should NEVER be nil. } |