diff --git a/gobreaker.go b/gobreaker.go index 7503a27..934a8e9 100644 --- a/gobreaker.go +++ b/gobreaker.go @@ -245,31 +245,31 @@ func (cb *CircuitBreaker) Execute(req func() (interface{}, error)) (interface{}, } // Name returns the name of the TwoStepCircuitBreaker. -func (tscb *TwoStepCircuitBreaker) Name() string { - return tscb.cb.Name() +func (breaker *TwoStepCircuitBreaker) Name() string { + return breaker.cb.Name() } // State returns the current state of the TwoStepCircuitBreaker. -func (tscb *TwoStepCircuitBreaker) State() State { - return tscb.cb.State() +func (breaker *TwoStepCircuitBreaker) State() State { + return breaker.cb.State() } // Counts returns internal counters -func (tscb *TwoStepCircuitBreaker) Counts() Counts { - return tscb.cb.Counts() +func (breaker *TwoStepCircuitBreaker) Counts() Counts { + return breaker.cb.Counts() } // Allow checks if a new request can proceed. It returns a callback that should be used to // register the success or failure in a separate step. If the circuit breaker doesn't allow // requests, it returns an error. -func (tscb *TwoStepCircuitBreaker) Allow() (done func(success bool), err error) { - generation, err := tscb.cb.beforeRequest() +func (breaker *TwoStepCircuitBreaker) Allow() (afterRequestCallback func(success bool), err error) { + generation, err := breaker.cb.beforeRequest() if err != nil { return nil, err } return func(success bool) { - tscb.cb.afterRequest(generation, success) + breaker.cb.afterRequest(generation, success) }, nil } diff --git a/gobreaker_test.go b/gobreaker_test.go index c20169d..aa725a1 100644 --- a/gobreaker_test.go +++ b/gobreaker_test.go @@ -44,12 +44,12 @@ func succeedLater(cb *CircuitBreaker, delay time.Duration) <-chan error { } func succeed2Step(cb *TwoStepCircuitBreaker) error { - done, err := cb.Allow() + afterRequestCallback, err := cb.Allow() if err != nil { return err } - done(true) + afterRequestCallback(true) return nil } @@ -63,12 +63,12 @@ func fail(cb *CircuitBreaker) error { } func fail2Step(cb *TwoStepCircuitBreaker) error { - done, err := cb.Allow() + afterRequestCallback, err := cb.Allow() if err != nil { return err } - done(false) + afterRequestCallback(false) return nil }