From 279fd9abe8346c3d5d39c5e1159368dba4ca6a72 Mon Sep 17 00:00:00 2001 From: HirazawaUi <695097494plus@gmail.com> Date: Wed, 2 Mar 2022 21:51:20 +0800 Subject: [PATCH] After adding or deleting an ipset entry error, the cause of the error will be displayed --- pkg/util/ipset/ipset.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/util/ipset/ipset.go b/pkg/util/ipset/ipset.go index 3481480dedd..04c920a83f9 100644 --- a/pkg/util/ipset/ipset.go +++ b/pkg/util/ipset/ipset.go @@ -313,16 +313,16 @@ func (runner *runner) AddEntry(entry string, set *IPSet, ignoreExistErr bool) er if ignoreExistErr { args = append(args, "-exist") } - if _, err := runner.exec.Command(IPSetCmd, args...).CombinedOutput(); err != nil { - return fmt.Errorf("error adding entry %s, error: %v", entry, err) + if out, err := runner.exec.Command(IPSetCmd, args...).CombinedOutput(); err != nil { + return fmt.Errorf("error adding entry %s, error: %v (%s)", entry, err, out) } return nil } // DelEntry is used to delete the specified entry from the set. func (runner *runner) DelEntry(entry string, set string) error { - if _, err := runner.exec.Command(IPSetCmd, "del", set, entry).CombinedOutput(); err != nil { - return fmt.Errorf("error deleting entry %s: from set: %s, error: %v", entry, set, err) + if out, err := runner.exec.Command(IPSetCmd, "del", set, entry).CombinedOutput(); err != nil { + return fmt.Errorf("error deleting entry %s: from set: %s, error: %v (%s)", entry, set, err, out) } return nil }