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

[chore] improved federatingdb logging in cases of unknown iri / types (#3313)

Browse source 
* improved federatingdb logging in cases of unknown iri / types, add new log methods

* whoops; forgot to wrap log argument in serialize{} !

* use debug instead of warn level

* switch last entry to Debug
This commit is contained in:
kim 2024-09-17 19:35:47 +00:00 • committed by GitHub
commit 8effc77788
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 146 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

26
internal/federation/federatingdb/util.go
View file

@ -23,7 +23,7 @@ import (
"fmt"
"net/url"
"codeberg.org/gruf/go-logger/v2/level"
"codeberg.org/gruf/go-byteutil"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
@ -91,15 +91,7 @@ func sameActor(actor1 vocab.ActivityStreamsActorProperty, actor2 vocab.ActivityS
// 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) {
if log.Level() >= level.DEBUG {
i, err := marshalItem(t)
if err != nil {
return nil, err
}
l := log.WithContext(ctx).
WithField("newID", i)
l.Debug("entering NewID")
}
log.DebugKV(ctx, "newID", serialize{t})
// Most of our types set an ID already
// by this point, return this if found.
@ -268,16 +260,20 @@ func getActivityContext(ctx context.Context) activityContext {
}
}
func marshalItem(item vocab.Type) (string, error) {
m, err := ap.Serialize(item)
// serialize wraps a vocab.Type to provide
// lazy-serialization along with error output.
type serialize struct{ item vocab.Type }
func (s serialize) String() string {
m, err := ap.Serialize(s.item)
if err != nil {
return "", err
return "!(error serializing item: " + err.Error() + ")"
}
b, err := json.Marshal(m)
if err != nil {
return "", err
return "!(error json marshaling item: " + err.Error() + ")"
}
return string(b), nil
return byteutil.B2S(b)
}