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/processingmedia.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/processingmedia.go')
-rw-r--r-- | internal/media/processingmedia.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/media/processingmedia.go b/internal/media/processingmedia.go index b4eda4072..c00c203a6 100644 --- a/internal/media/processingmedia.go +++ b/internal/media/processingmedia.go @@ -67,7 +67,7 @@ func (p *ProcessingMedia) LoadAttachment(ctx context.Context) (*gtsmodel.MediaAt if !done { // Provided context was cancelled, e.g. request cancelled // early. Queue this item for asynchronous processing. - log.Warnf("reprocessing media %s after canceled ctx", p.media.ID) + log.Warnf(ctx, "reprocessing media %s after canceled ctx", p.media.ID) go p.mgr.state.Workers.Media.Enqueue(p.Process) } @@ -77,7 +77,7 @@ func (p *ProcessingMedia) LoadAttachment(ctx context.Context) (*gtsmodel.MediaAt // Process allows the receiving object to fit the runners.WorkerFunc signature. It performs a (blocking) load and logs on error. func (p *ProcessingMedia) Process(ctx context.Context) { if _, _, err := p.load(ctx); err != nil { - log.Errorf("error processing media: %v", err) + log.Errorf(ctx, "error processing media: %v", err) } } @@ -151,7 +151,7 @@ func (p *ProcessingMedia) store(ctx context.Context) error { // ensure post callback gets called. if err := p.postFn(ctx); err != nil { - log.Errorf("error executing postdata function: %v", err) + log.Errorf(ctx, "error executing postdata function: %v", err) } }() @@ -164,7 +164,7 @@ func (p *ProcessingMedia) store(ctx context.Context) error { defer func() { // Ensure data reader gets closed on return. if err := rc.Close(); err != nil { - log.Errorf("error closing data reader: %v", err) + log.Errorf(ctx, "error closing data reader: %v", err) } }() @@ -220,7 +220,7 @@ func (p *ProcessingMedia) store(ctx context.Context) error { // This shouldn't already exist, but we do a check as it's worth logging. if have, _ := p.mgr.state.Storage.Has(ctx, p.media.File.Path); have { - log.Warnf("media already exists at storage path: %s", p.media.File.Path) + log.Warnf(ctx, "media already exists at storage path: %s", p.media.File.Path) // Attempt to remove existing media at storage path (might be broken / out-of-date) if err := p.mgr.state.Storage.Delete(ctx, p.media.File.Path); err != nil { @@ -333,7 +333,7 @@ func (p *ProcessingMedia) finish(ctx context.Context) error { // This shouldn't already exist, but we do a check as it's worth logging. if have, _ := p.mgr.state.Storage.Has(ctx, p.media.Thumbnail.Path); have { - log.Warnf("thumbnail already exists at storage path: %s", p.media.Thumbnail.Path) + log.Warnf(ctx, "thumbnail already exists at storage path: %s", p.media.Thumbnail.Path) // Attempt to remove existing thumbnail at storage path (might be broken / out-of-date) if err := p.mgr.state.Storage.Delete(ctx, p.media.Thumbnail.Path); err != nil { |