Include more context in error messages from CNI operations

This commit is contained in:
Bryan Boreham committed 2016-10-18 17:45:09 +01:00
1 parent 71f8bb7e9a
commit b38a55ca7c
1 file changed
+3 -3
+3 -3
View File
@@ -93,7 +93,7 @@ func (c *CNIPlugin) CmdAdd(args *skel.CmdArgs) error {
ns, err := netns.GetFromPath(args.Netns)
if err != nil {
return err
return fmt.Errorf("error accessing namespace %q: %s", args.Netns, err)
}
defer ns.Close()
@@ -183,7 +183,7 @@ func (c *CNIPlugin) CmdDel(args *skel.CmdArgs) error {
ns, err := netns.GetFromPath(args.Netns)
if err != nil {
return err
return fmt.Errorf("error accessing namespace %q: %s", args.Netns, err)
}
defer ns.Close()
err = weavenet.WithNetNSUnsafe(ns, func() error {
@@ -194,7 +194,7 @@ func (c *CNIPlugin) CmdDel(args *skel.CmdArgs) error {
return netlink.LinkDel(link)
})
if err != nil {
return fmt.Errorf("error removing interface: %s", err)
return fmt.Errorf("error removing interface %q: %s", args.IfName, err)
}
// Default IPAM is Weave's own