From cbeaf3e5bf65a58c1faa72d2a25adcd7b0a6d3e5 Mon Sep 17 00:00:00 2001 From: dax Date: Mon, 20 May 2019 13:15:35 -0700 Subject: [PATCH] Fix error shadowing --- controller/generic_controller.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/controller/generic_controller.go b/controller/generic_controller.go index 02fed9c9..c80e5353 100644 --- a/controller/generic_controller.go +++ b/controller/generic_controller.go @@ -268,7 +268,7 @@ func (g *genericController) processNextWorkItem() bool { return true } - if err := filterConflictsError(err); err != nil { + if err = filterConflictsError(err); err != nil { logrus.Errorf("%v %v %v", g.name, key, err) } @@ -302,9 +302,9 @@ func filterConflictsError(err error) error { if errs, ok := errors2.Cause(err).(*types.MultiErrors); ok { var newErrors []error - for _, err := range errs.Errors { - if !ignoreError(err, true) { - newErrors = append(newErrors, err) + for _, newError := range errs.Errors { + if !ignoreError(newError, true) { + newErrors = append(newErrors, newError) } } return types.NewErrors(newErrors...) @@ -345,7 +345,8 @@ func (g *genericController) syncHandler(key interface{}) (err error) { logrus.Debugf("%s calling handler %s %s", g.name, handler.name, s) metrics.IncTotalHandlerExecution(g.name, handler.name) - if newObj, err := handler.handler(s, obj); err != nil { + var newObj interface{} + if newObj, err = handler.handler(s, obj); err != nil { if !ignoreError(err, false) { metrics.IncTotalHandlerFailure(g.name, handler.name, s) }