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

Merge pull request #300 from Random-Liu/improve-some-error-message

Browse Source 
Better format several errors
This commit is contained in:
Lantao Liu
2017-09-27 22:47:15 -07:00
committed by GitHub
parent e723a5018b 517f697f62
commit d6e04d871e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/os/os.go
View File

@@ -155,5 +155,5 @@ func (RealOS) DeviceUUID(device string) (string, error) {
return file.Name(), nil
}
}
return "", fmt.Errorf("device not found")
return "", fmt.Errorf("device %q not found", device)
}

2
pkg/server/service.go
View File

@@ -141,7 +141,7 @@ func NewCRIContainerdService(config options.Config) (CRIContainerdService, error
imageFSPath := imageFSPath(config.ContainerdConfig.RootDir, config.ContainerdConfig.Snapshotter)
c.imageFSUUID, err = c.getDeviceUUID(imageFSPath)
if err != nil {
return nil, fmt.Errorf("failed to get imagefs uuid: %v", err)
return nil, fmt.Errorf("failed to get imagefs uuid of %q: %v", imageFSPath, err)
}
c.netPlugin, err = ocicni.InitCNI(config.NetworkPluginConfDir, config.NetworkPluginBinDir)