From b38a55ca7c2a98d3dbe948d8ec25f53ba8dc162c Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 18 Oct 2016 17:45:09 +0100 Subject: [PATCH] Include more context in error messages from CNI operations --- plugin/net/cni.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/net/cni.go b/plugin/net/cni.go index ff75e8cc..0fdd5b41 100644 --- a/plugin/net/cni.go +++ b/plugin/net/cni.go @@ -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