Skip to content

feat: update log messages to follow slog syntax #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 22, 2025
Merged

feat: update log messages to follow slog syntax #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b20270
update to correct slog syntax
AustinAbro321 Apr 22, 2025
0e3263a
semicolon
AustinAbro321 Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions oci/copier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ func Copy(ctx context.Context, src *OrasRemote, dst *OrasRemote,
for idx, layer := range layers {
b, err := json.MarshalIndent(layer, "", " ")
if err != nil {
src.log.Debug(fmt.Sprintf("ERROR marshalling json: %s", err.Error()))
src.log.Debug("failed to marshal json", "error", err.Error())
}
src.log.Debug(fmt.Sprintf("Copying layer: %s", string(b)))
src.log.Debug("Copying layer", "layer", string(b))
if err := sem.Acquire(ctx, 1); err != nil {
return err
}
Expand All @@ -52,7 +52,7 @@ func Copy(ctx context.Context, src *OrasRemote, dst *OrasRemote,
return err
}
if exists {
src.log.Debug("Layer already exists in destination, skipping")
src.log.Debug("layer already exists in destination, skipping")
b := make([]byte, layer.Size)
_, _ = progressBar.Write(b)
progressBar.Updatef("[%d/%d] layers copied", idx+1, len(layers))
Expand Down Expand Up @@ -106,8 +106,7 @@ func Copy(ctx context.Context, src *OrasRemote, dst *OrasRemote,
}

duration := time.Since(start)
src.log.Debug(fmt.Sprintf("Copied %s to %s with a concurrency of %d and took %s",
src.repo.Reference, dst.repo.Reference, concurrency, duration))
src.log.Debug("copy successful", "source", src.repo.Reference, "destination", dst.repo.Reference, "concurrency", concurrency, "duration", duration)

return nil
}
4 changes: 2 additions & 2 deletions oci/progress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ func (o *OrasRemote) printLayer(desc ocispec.Descriptor, suffix string) error {
title := desc.Annotations[ocispec.AnnotationTitle]
var layerInfo string
if title != "" {
layerInfo = fmt.Sprintf("%s %s", desc.Digest.Encoded()[:12], helpers.First30last30(title))
layerInfo = fmt.Sprintf("%s %s", desc.Digest.Encoded()[:12], helpers.First30Last30(title))
} else {
layerInfo = fmt.Sprintf("%s [%s]", desc.Digest.Encoded()[:12], desc.MediaType)
}
o.log.Debug(fmt.Sprintf("%s (%s)", layerInfo, suffix))
o.log.Debug("operation successful", "layer", layerInfo, "operation", suffix)
return nil
}
Loading