rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-03 08:14:40 +00:00
Code Issues Releases Wiki Activity

Fix error shadowing

Browse Source
This commit is contained in:
dax
2019-05-20 13:15:35 -07:00
committed by Craig Jellick
parent 93f43c6a13
commit cbeaf3e5bf
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
controller/generic_controller.go
View File

@@ -268,7 +268,7 @@ func (g *genericController) processNextWorkItem() bool {
return true return true
} }
if err := filterConflictsError(err); err != nil { if err = filterConflictsError(err); err != nil {
logrus.Errorf("%v %v %v", g.name, key, err) 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 { if errs, ok := errors2.Cause(err).(*types.MultiErrors); ok {
var newErrors []error var newErrors []error
for _, err := range errs.Errors { for _, newError := range errs.Errors {
if !ignoreError(err, true) { if !ignoreError(newError, true) {
newErrors = append(newErrors, err) newErrors = append(newErrors, newError)
} }
} }
return types.NewErrors(newErrors...) 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) logrus.Debugf("%s calling handler %s %s", g.name, handler.name, s)
metrics.IncTotalHandlerExecution(g.name, handler.name) 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) { if !ignoreError(err, false) {
metrics.IncTotalHandlerFailure(g.name, handler.name, s) metrics.IncTotalHandlerFailure(g.name, handler.name, s)
} }