diff options
| author |  Daenney <daenney@users.noreply.github.com> | 2023-02-17 12:02:29 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-17 12:02:29 +0100 |
| commit | 68e6d08c768b789987a753d42f66caf73ce10ee1 (patch) | |
| tree | 1c9eb6da6c326266d653de80684c3aec58922638 /internal/media/prune.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/prune.go')
| -rw-r--r-- | internal/media/prune.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/media/prune.go b/internal/media/prune.go index bb0993759..975a82e33 100644 --- a/internal/media/prune.go +++ b/internal/media/prune.go @@ -48,34 +48,34 @@ func (m *manager) PruneAll(ctx context.Context, mediaCacheRemoteDays int, blocki if err != nil { errs = append(errs, fmt.Sprintf("error pruning unused local media (%s)", err)) } else { - log.Infof("pruned %d unused local media", pruned) + log.Infof(ctx, "pruned %d unused local media", pruned) } pruned, err = m.PruneUnusedRemote(innerCtx, dry) if err != nil { errs = append(errs, fmt.Sprintf("error pruning unused remote media: (%s)", err)) } else { - log.Infof("pruned %d unused remote media", pruned) + log.Infof(ctx, "pruned %d unused remote media", pruned) } pruned, err = m.UncacheRemote(innerCtx, mediaCacheRemoteDays, dry) if err != nil { errs = append(errs, fmt.Sprintf("error uncacheing remote media older than %d day(s): (%s)", mediaCacheRemoteDays, err)) } else { - log.Infof("uncached %d remote media older than %d day(s)", pruned, mediaCacheRemoteDays) + log.Infof(ctx, "uncached %d remote media older than %d day(s)", pruned, mediaCacheRemoteDays) } pruned, err = m.PruneOrphaned(innerCtx, dry) if err != nil { errs = append(errs, fmt.Sprintf("error pruning orphaned media: (%s)", err)) } else { - log.Infof("pruned %d orphaned media", pruned) + log.Infof(ctx, "pruned %d orphaned media", pruned) } if err := m.state.Storage.Storage.Clean(innerCtx); err != nil { errs = append(errs, fmt.Sprintf("error cleaning storage: (%s)", err)) } else { - log.Info("cleaned storage") + log.Info(ctx, "cleaned storage") } return errs.Combine() @@ -87,7 +87,7 @@ func (m *manager) PruneAll(ctx context.Context, mediaCacheRemoteDays int, blocki go func() { if err := f(context.Background()); err != nil { - log.Error(err) + log.Error(ctx, err) } }() |