[chore] Update more log calls to include context (#1517)

In #1476 we updated log.WithFields() but we forgot about
log.WithField(). Also updates a few explicit log.Entry{} creations.
This commit is contained in:
Daenney 2023-02-17 20:05:43 +01:00 committed by GitHub
parent d39280ec33
commit b4d18887d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 19 additions and 12 deletions

View File

@ -119,10 +119,11 @@ func (w *WorkerPool[MsgType]) Queue(msg MsgType) {
// Create new process function for msg
process := func(ctx context.Context) {
if err := w.process(ctx, msg); err != nil {
log.WithFields(kv.Fields{
kv.Field{K: "type", V: w.wtype},
kv.Field{K: "error", V: err},
}...).Error("message processing error")
log.WithContext(ctx).
WithFields(kv.Fields{
kv.Field{K: "type", V: w.wtype},
kv.Field{K: "error", V: err},
}...).Error("message processing error")
}
}

View File

@ -39,7 +39,8 @@ func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsA
if err != nil {
return err
}
l := log.WithField("accept", i)
l := log.WithContext(ctx).
WithField("accept", i)
l.Debug("entering Accept")
}

View File

@ -35,7 +35,8 @@ func (f *federatingDB) Announce(ctx context.Context, announce vocab.ActivityStre
if err != nil {
return err
}
l := log.WithField("announce", i)
l := log.WithContext(ctx).
WithField("announce", i)
l.Debug("entering Announce")
}

View File

@ -38,7 +38,8 @@ func (f *federatingDB) Reject(ctx context.Context, reject vocab.ActivityStreamsR
if err != nil {
return err
}
l := log.WithField("reject", i)
l := log.WithContext(ctx).
WithField("reject", i)
l.Debug("entering Reject")
}

View File

@ -32,7 +32,7 @@
)
func (f *federatingDB) Undo(ctx context.Context, undo vocab.ActivityStreamsUndo) error {
l := log.Entry{}
l := log.Entry{}.WithContext(ctx)
if log.Level() >= level.DEBUG {
i, err := marshalItem(undo)

View File

@ -42,7 +42,7 @@
//
// The library makes this call only after acquiring a lock first.
func (f *federatingDB) Update(ctx context.Context, asType vocab.Type) error {
l := log.Entry{}
l := log.Entry{}.WithContext(ctx)
if log.Level() >= level.DEBUG {
i, err := marshalItem(asType)

View File

@ -69,7 +69,8 @@ func (f *federatingDB) NewID(ctx context.Context, t vocab.Type) (idURL *url.URL,
if err != nil {
return nil, err
}
l := log.WithField("newID", i)
l := log.WithContext(ctx).
WithField("newID", i)
l.Debug("entering NewID")
}

View File

@ -319,7 +319,8 @@ func (m *manager) PreProcessEmoji(ctx context.Context, data DataFunc, postData P
}
}
l := log.WithField("shortcode@domain", emoji.Shortcode+"@"+emoji.Domain)
l := log.WithContext(ctx).
WithField("shortcode@domain", emoji.Shortcode+"@"+emoji.Domain)
l.Debug("postData: cleaning up old emoji files for refreshed emoji")
if err := m.state.Storage.Delete(innerCtx, originalImagePath); err != nil && !errors.Is(err, storage.ErrNotFound) {
l.Errorf("postData: error cleaning up old emoji image at %s for refreshed emoji: %s", originalImagePath, err)

View File

@ -243,7 +243,8 @@ func (c *converter) ASStatusToStatus(ctx context.Context, statusable ap.Statusab
}
status.URI = uriProp.GetIRI().String()
l := log.WithField("statusURI", status.URI)
l := log.WithContext(ctx).
WithField("statusURI", status.URI)
// web url for viewing this status
if statusURL, err := ap.ExtractURL(statusable); err == nil {