diff options
author | 2023-02-17 12:02:29 +0100 | |
---|---|---|
committer | 2023-02-17 12:02:29 +0100 | |
commit | 68e6d08c768b789987a753d42f66caf73ce10ee1 (patch) | |
tree | 1c9eb6da6c326266d653de80684c3aec58922638 /internal/media/refetch.go | |
parent | [bugfix] Set 'discoverable' properly on API accounts (#1511) (diff) | |
download | gotosocial-68e6d08c768b789987a753d42f66caf73ce10ee1.tar.xz |
[feature] Add a request ID and include it in logs (#1476)
This adds a lightweight form of tracing to GTS. Each incoming request is
assigned a Request ID which we then pass on and log in all our log
lines. Any function that gets called downstream from an HTTP handler
should now emit a requestID=value pair whenever it logs something.
Co-authored-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/media/refetch.go')
-rw-r--r-- | internal/media/refetch.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/internal/media/refetch.go b/internal/media/refetch.go index 3d572e4b9..8c2a62c94 100644 --- a/internal/media/refetch.go +++ b/internal/media/refetch.go @@ -51,7 +51,7 @@ func (m *manager) RefetchEmojis(ctx context.Context, domain string, dereferenceM if err != nil { if !errors.Is(err, db.ErrNoEntries) { // an actual error has occurred - log.Errorf("error fetching emojis from database: %s", err) + log.Errorf(ctx, "error fetching emojis from database: %s", err) } break } @@ -79,10 +79,10 @@ func (m *manager) RefetchEmojis(ctx context.Context, domain string, dereferenceM // bail early if we've got nothing to do toRefetchCount := len(refetchIDs) if toRefetchCount == 0 { - log.Debug("no remote emojis require a refetch") + log.Debug(ctx, "no remote emojis require a refetch") return 0, nil } - log.Debugf("%d remote emoji(s) require a refetch, doing that now...", toRefetchCount) + log.Debugf(ctx, "%d remote emoji(s) require a refetch, doing that now...", toRefetchCount) var totalRefetched int for _, emojiID := range refetchIDs { @@ -94,13 +94,13 @@ func (m *manager) RefetchEmojis(ctx context.Context, domain string, dereferenceM shortcodeDomain := util.ShortcodeDomain(emoji) if emoji.ImageRemoteURL == "" { - log.Errorf("remote emoji %s could not be refreshed because it has no ImageRemoteURL set", shortcodeDomain) + log.Errorf(ctx, "remote emoji %s could not be refreshed because it has no ImageRemoteURL set", shortcodeDomain) continue } emojiImageIRI, err := url.Parse(emoji.ImageRemoteURL) if err != nil { - log.Errorf("remote emoji %s could not be refreshed because its ImageRemoteURL (%s) is not a valid uri: %s", shortcodeDomain, emoji.ImageRemoteURL, err) + log.Errorf(ctx, "remote emoji %s could not be refreshed because its ImageRemoteURL (%s) is not a valid uri: %s", shortcodeDomain, emoji.ImageRemoteURL, err) continue } @@ -116,16 +116,16 @@ func (m *manager) RefetchEmojis(ctx context.Context, domain string, dereferenceM VisibleInPicker: emoji.VisibleInPicker, }, true) if err != nil { - log.Errorf("emoji %s could not be refreshed because of an error during processing: %s", shortcodeDomain, err) + log.Errorf(ctx, "emoji %s could not be refreshed because of an error during processing: %s", shortcodeDomain, err) continue } if _, err := processingEmoji.LoadEmoji(ctx); err != nil { - log.Errorf("emoji %s could not be refreshed because of an error during loading: %s", shortcodeDomain, err) + log.Errorf(ctx, "emoji %s could not be refreshed because of an error during loading: %s", shortcodeDomain, err) continue } - log.Tracef("refetched emoji %s successfully from remote", shortcodeDomain) + log.Tracef(ctx, "refetched emoji %s successfully from remote", shortcodeDomain) totalRefetched++ } |