kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove nil contexts

Browse source 
Causes daemon panic because loggers can’t be found.

Fixes #15724

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2015-08-21 10:28:35 -07:00
parent 272a3eef94
commit 0c08913d52
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
graph/pull_v2.go
View file

@ -141,9 +141,9 @@ func (p *v2Puller) download(di *downloadInfo) {
} }
di.tmpFile = tmpFile di.tmpFile = tmpFile
blobs := p.repo.Blobs(nil) blobs := p.repo.Blobs(context.Background())
desc, err := blobs.Stat(nil, di.digest) desc, err := blobs.Stat(context.Background(), di.digest)
if err != nil { if err != nil {
logrus.Debugf("Error statting layer: %v", err) logrus.Debugf("Error statting layer: %v", err)
di.err <- err di.err <- err
@ -151,7 +151,7 @@ func (p *v2Puller) download(di *downloadInfo) {
} }
di.size = desc.Size di.size = desc.Size
layerDownload, err := blobs.Open(nil, di.digest) layerDownload, err := blobs.Open(context.Background(), di.digest)
if err != nil { if err != nil {
logrus.Debugf("Error fetching layer: %v", err) logrus.Debugf("Error fetching layer: %v", err)
di.err <- err di.err <- err

8
graph/push_v2.go
View file

@ -138,7 +138,7 @@ func (p *v2Pusher) pushV2Tag(tag string) error {
dgst, err := p.graph.GetDigest(layer.ID) dgst, err := p.graph.GetDigest(layer.ID)
switch err { switch err {
case nil: case nil:
_, err := p.repo.Blobs(nil).Stat(nil, dgst) _, err := p.repo.Blobs(context.Background()).Stat(context.Background(), dgst)
switch err { switch err {
case nil: case nil:
exists = true exists = true
@ -158,7 +158,7 @@ func (p *v2Pusher) pushV2Tag(tag string) error {
// if digest was empty or not saved, or if blob does not exist on the remote repository, // if digest was empty or not saved, or if blob does not exist on the remote repository,
// then fetch it. // then fetch it.
if !exists { if !exists {
if pushDigest, err := p.pushV2Image(p.repo.Blobs(nil), layer); err != nil { if pushDigest, err := p.pushV2Image(p.repo.Blobs(context.Background()), layer); err != nil {
return err return err
} else if pushDigest != dgst { } else if pushDigest != dgst {
// Cache new checksum // Cache new checksum
@ -226,7 +226,7 @@ func (p *v2Pusher) pushV2Image(bs distribution.BlobService, img *image.Image) (d
// Send the layer // Send the layer
logrus.Debugf("rendered layer for %s of [%d] size", img.ID, size) logrus.Debugf("rendered layer for %s of [%d] size", img.ID, size)
layerUpload, err := bs.Create(nil) layerUpload, err := bs.Create(context.Background())
if err != nil { if err != nil {
return "", err return "", err
} }
@ -250,7 +250,7 @@ func (p *v2Pusher) pushV2Image(bs distribution.BlobService, img *image.Image) (d
} }
desc := distribution.Descriptor{Digest: dgst} desc := distribution.Descriptor{Digest: dgst}
if _, err := layerUpload.Commit(nil, desc); err != nil { if _, err := layerUpload.Commit(context.Background(), desc); err != nil {
return "", err return "", err
} }