SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

[bugfix] Suppress 'errNoEntries' warnings from InboxForwarding function call (#2102)

This commit is contained in:
tobi 2023-08-11 15:17:36 +02:00 committed by GitHub
parent dc99e9e10b
commit a1768a83e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/federation/federatingactor.go
View File

@ -27,6 +27,7 @@ import (
"net/url" "net/url"
"strings" "strings"
errorsv2 "codeberg.org/gruf/go-errors/v2"
"codeberg.org/gruf/go-kv" "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/activity/pub" "github.com/superseriousbusiness/activity/pub"
"github.com/superseriousbusiness/activity/streams" "github.com/superseriousbusiness/activity/streams"
@ -223,14 +224,21 @@ func (f *federatingActor) PostInboxScheme(ctx context.Context, w http.ResponseWr
// is in the database. // is in the database.
// //
// Since our `Exists()` function currently *always* // Since our `Exists()` function currently *always*
// returns false, it will *always* attempt to insert // returns false, it will *always* attempt to parse
// the Activity. Therefore, we ignore AlreadyExists // out and insert the Activity, trying to fetch other
// errors. // items from the DB in the process, which may or may
// not exist yet. Therefore, we should expect some
// errors coming from this function, and only warn log
// on certain ones.
// //
// This check may be removed when the `Exists()` func // This check may be removed when the `Exists()` func
// is updated, and/or federating callbacks are handled // is updated, and/or federating callbacks are handled
// properly. // properly.
if !errors.Is(err, db.ErrAlreadyExists) { if !errorsv2.Comparable(
err,
db.ErrAlreadyExists,
db.ErrNoEntries,
) {
// Failed inbox forwarding is not a show-stopper, // Failed inbox forwarding is not a show-stopper,
// and doesn't even necessarily denote a real error. // and doesn't even necessarily denote a real error.
l.Warnf("error calling sideEffectActor.InboxForwarding: %q", err) l.Warnf("error calling sideEffectActor.InboxForwarding: %q", err)