Merge pull request #1817 from cezarsa/master

Avoid formatting errors with %#v
This commit is contained in:
Derek McGowan 2016-07-01 10:59:50 -07:00 committed by GitHub
commit 4e17ab5d31
2 changed files with 2 additions and 2 deletions

View file

@ -246,7 +246,7 @@ func (buh *blobUploadHandler) PutBlobUploadComplete(w http.ResponseWriter, r *ht
case distribution.ErrBlobInvalidLength, distribution.ErrBlobDigestUnsupported: case distribution.ErrBlobInvalidLength, distribution.ErrBlobDigestUnsupported:
buh.Errors = append(buh.Errors, v2.ErrorCodeBlobUploadInvalid.WithDetail(err)) buh.Errors = append(buh.Errors, v2.ErrorCodeBlobUploadInvalid.WithDetail(err))
default: default:
ctxu.GetLogger(buh).Errorf("unknown error completing upload: %#v", err) ctxu.GetLogger(buh).Errorf("unknown error completing upload: %v", err)
buh.Errors = append(buh.Errors, errcode.ErrorCodeUnknown.WithDetail(err)) buh.Errors = append(buh.Errors, errcode.ErrorCodeUnknown.WithDetail(err))
} }

View file

@ -64,7 +64,7 @@ func (bs *blobStore) Put(ctx context.Context, mediaType string, p []byte) (distr
// content already present // content already present
return desc, nil return desc, nil
} else if err != distribution.ErrBlobUnknown { } else if err != distribution.ErrBlobUnknown {
context.GetLogger(ctx).Errorf("blobStore: error stating content (%v): %#v", dgst, err) context.GetLogger(ctx).Errorf("blobStore: error stating content (%v): %v", dgst, err)
// real error, return it // real error, return it
return distribution.Descriptor{}, err return distribution.Descriptor{}, err
} }