From 517f697f622690a8e054f00ad6e5d93d41c1c926 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Thu, 28 Sep 2017 01:08:42 +0000 Subject: [PATCH] Better format several errors Signed-off-by: Lantao Liu --- cmd/cri-containerd/cri_containerd.go | 4 ++-- pkg/os/os.go | 2 +- pkg/server/service.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/cri-containerd/cri_containerd.go b/cmd/cri-containerd/cri_containerd.go index 79e385942..94f0c6058 100644 --- a/cmd/cri-containerd/cri_containerd.go +++ b/cmd/cri-containerd/cri_containerd.go @@ -40,7 +40,7 @@ func main() { glog.Exitf("Failed to init CRI containerd flags: %v", err) } - glog.V(2).Infof("Run cri-containerd %+v", o) + glog.V(0).Infof("Run cri-containerd %+v", o) if o.PrintVersion { version.PrintVersion() os.Exit(0) @@ -56,7 +56,7 @@ func main() { glog.V(2).Infof("Run cri-containerd grpc server on socket %q", o.SocketPath) s, err := server.NewCRIContainerdService(o.Config) if err != nil { - glog.Exitf("Failed to create CRI containerd service %+v: %v", o, err) + glog.Exitf("Failed to create CRI containerd service: %v", err) } // Use interrupt handler to make sure the server to be stopped properly. // Pass in non-empty final function to avoid os.Exit(1). We expect `Run` diff --git a/pkg/os/os.go b/pkg/os/os.go index 57945d57f..b97e5eab9 100644 --- a/pkg/os/os.go +++ b/pkg/os/os.go @@ -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) } diff --git a/pkg/server/service.go b/pkg/server/service.go index eb53b9897..0a93e234d 100644 --- a/pkg/server/service.go +++ b/pkg/server/service.go @@ -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)