github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5202 from wzshiming/fix/dgst-debug

Browse Source 
Change dgst to digest in debug
This commit is contained in:
Michael Crosby
2021-03-18 11:54:44 -04:00
committed by GitHub
parent 63b605d8fd 766e7953ab
commit 969b3d638b
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/ctr/commands/content/prune.go
View File

@@ -81,7 +81,10 @@ var pruneReferencesCommand = cli.Command{
for k := range info.Labels { for k := range info.Labels {
if isLayerLabel(k) { if isLayerLabel(k) {
log.G(ctx).WithField("dgst", info.Digest).WithField("label", k).Debug("Removing label") log.G(ctx).WithFields(logrus.Fields{
"digest": info.Digest,
"label": k,
}).Debug("Removing label")
if dryRun { if dryRun {
continue continue
} }

8
diff/apply/apply.go
View File

@@ -54,10 +54,10 @@ func (s *fsApplier) Apply(ctx context.Context, desc ocispec.Descriptor, mounts [
defer func() { defer func() {
if err == nil { if err == nil {
log.G(ctx).WithFields(logrus.Fields{ log.G(ctx).WithFields(logrus.Fields{
"d": time.Since(t1), "d": time.Since(t1),
"dgst": desc.Digest, "digest": desc.Digest,
"size": desc.Size, "size": desc.Size,
"media": desc.MediaType, "media": desc.MediaType,
}).Debugf("diff applied") }).Debugf("diff applied")
} }
}() }()

8
diff/lcow/lcow.go
View File

@@ -100,10 +100,10 @@ func (s windowsLcowDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mou
defer func() { defer func() {
if err == nil { if err == nil {
log.G(ctx).WithFields(logrus.Fields{ log.G(ctx).WithFields(logrus.Fields{
"d": time.Since(t1), "d": time.Since(t1),
"dgst": desc.Digest, "digest": desc.Digest,
"size": desc.Size, "size": desc.Size,
"media": desc.MediaType, "media": desc.MediaType,
}).Debugf("diff applied") }).Debugf("diff applied")
} }
}() }()

8
diff/windows/windows.go
View File

@@ -90,10 +90,10 @@ func (s windowsDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mounts
defer func() { defer func() {
if err == nil { if err == nil {
log.G(ctx).WithFields(logrus.Fields{ log.G(ctx).WithFields(logrus.Fields{
"d": time.Since(t1), "d": time.Since(t1),
"dgst": desc.Digest, "digest": desc.Digest,
"size": desc.Size, "size": desc.Size,
"media": desc.MediaType, "media": desc.MediaType,
}).Debugf("diff applied") }).Debugf("diff applied")
} }
}() }()