diff options
| author |  kim <grufwub@gmail.com> | 2025-05-15 09:40:48 +0000 |
|---|---|---|
| committer |  kim <gruf@noreply.codeberg.org> | 2025-05-15 09:40:48 +0000 |
| commit | 3cff4b2d7d138f45787a94e6e64acdccb00e8951 (patch) | |
| tree | d18f18289b3082b129d6e129aa383ddde5869521 /internal/transport/dereference.go | |
| parent | [chore] Change default database in example config to sqlite, update docs. (#4... (diff) | |
| download | gotosocial-3cff4b2d7d138f45787a94e6e64acdccb00e8951.tar.xz | |
[chore] various federatingdb tweaks (#4178)
after seeing a potential reported federating worker lockup i decided to start digging into the federatingdb code. this PR encompasses:
- removes one of our last unused interface types `federatingdb.DB{}`, replacing it with a struct type `*federatingdb.DB{}`
- in `transport.dereferenceLocal()` differentiates between an unsupported lookup type and ErrNoEntries to reduce unnecessary calls, and reduce potential lockups that may occur while trying to call our own endpoints that then call `federatingdb.Lock()`
- removes a bunch of the locks on follow state changes since the DB already synchronizes that
- removes the unnecessary `pub.Clock{}` struct field and type passed to the transport controller
frankly it would be great if we could remove the locking in `federatingdb.Lock()` and instead handle it ourselves as it gets very confusing trying to figure out what functions will have locks held. but i guess that's one for when we move further away from the go-fed/activity/pub package usage.
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4178
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/transport/dereference.go')
| -rw-r--r-- | internal/transport/dereference.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/internal/transport/dereference.go b/internal/transport/dereference.go index a7ef83d3e..164b23cd6 100644 --- a/internal/transport/dereference.go +++ b/internal/transport/dereference.go @@ -25,7 +25,7 @@ import ( apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "code.superseriousbusiness.org/gotosocial/internal/config" - "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/federatingdb" "code.superseriousbusiness.org/gotosocial/internal/gtserror" "code.superseriousbusiness.org/gotosocial/internal/log" ) @@ -38,10 +38,8 @@ func (t *transport) Dereference(ctx context.Context, iri *url.URL) (*http.Respon // to just make a normal http request to ourself. if iri.Host == config.GetHost() { rsp, err := t.controller.dereferenceLocal(ctx, iri) - if err != nil && !errors.Is(err, db.ErrNoEntries) { - // Real error. - err := gtserror.Newf("error trying dereferenceLocal: %w", err) - return nil, err + if err != nil && !errors.Is(err, federatingdb.ErrNotImplemented) { + return nil, gtserror.Newf("error dereferencing local: %w", err) } if rsp != nil { |