Fix panic in k8s loadIngresses

Signed-off-by: Emile Vauge <emile@vauge.com>

safe/routine.go

@@ -152,11 +152,10 @@ func OperationWithRecover(operation backoff.Operation) backoff.Operation {
 	return func() (err error) {
 		defer func() {
 			if res := recover(); res != nil {
-				defaultRecoverGoroutine(err)
+				defaultRecoverGoroutine(res)
 				err = fmt.Errorf("Panic in operation: %s", err)
 			}
 		}()
-		err = operation()
-		return nil
+		return operation()
 	}
 }

safe/routine_test.go

@@ -1,11 +1,22 @@
 package safe
 
 import (
+	"fmt"
 	"github.com/cenk/backoff"
 	"testing"
 )
 
 func TestOperationWithRecover(t *testing.T) {
+	operation := func() error {
+		return nil
+	}
+	err := backoff.Retry(OperationWithRecover(operation), &backoff.StopBackOff{})
+	if err != nil {
+		t.Fatalf("Error in OperationWithRecover: %s", err)
+	}
+}
+
+func TestOperationWithRecoverPanic(t *testing.T) {
 	operation := func() error {
 		panic("BOOM")
 	}
@@ -14,3 +25,13 @@ func TestOperationWithRecover(t *testing.T) {
 		t.Fatalf("Error in OperationWithRecover: %s", err)
 	}
 }
+
+func TestOperationWithRecoverError(t *testing.T) {
+	operation := func() error {
+		return fmt.Errorf("ERROR")
+	}
+	err := backoff.Retry(OperationWithRecover(operation), &backoff.StopBackOff{})
+	if err == nil {
+		t.Fatalf("Error in OperationWithRecover: %s", err)
+	}
+}