Merge 13cae9d into 0b7ed86

objenious · Jul 17, 2018 · 1cf2a58 · 1cf2a58
2 parents 0b7ed86 + 13cae9d
commit 1cf2a58
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/circuitbreaker/circuitbreaker.go b/circuitbreaker/circuitbreaker.go
@@ -25,6 +25,9 @@ func NewCircuitBreaker(cb *gobreaker.CircuitBreaker) endpoint.Middleware {
 				}
 				return cbResponse{res: res, err: err}, nil
 			})
+			if err == gobreaker.ErrOpenState || err == gobreaker.ErrTooManyRequests {
+				return nil, kitty.Retryable(err)
+			}
 			if cbres, ok := res.(cbResponse); ok {
 				return cbres.res, cbres.err
 			}

diff --git a/circuitbreaker/circuitbreaker_test.go b/circuitbreaker/circuitbreaker_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/go-kit/kit/endpoint"
+	"github.com/objenious/kitty"
 	"github.com/sony/gobreaker"
 )
 
@@ -28,8 +29,11 @@ func TestCircuitBreaker(t *testing.T) {
 			t.Error("the circuit breaker should return an error")
 		}
 		_, err = e(context.TODO(), nil)
-		if err == nil {
-			t.Error("the circuit breaker should return an error")
+		if err.Error() != gobreaker.ErrOpenState.Error() {
+			t.Error("the circuit breaker should trigger")
+		}
+		if !kitty.IsRetryable(err) {
+			t.Error("circuit breaker errors should be retryable")
 		}
 		if called > 1 {
 			t.Error("retryable errors should trigger the circuit breaker")