Make request_allowed? thread safe

Shopify · Aug 10, 2016 · 655b3c7 · 655b3c7
1 parent 27d0175
commit 655b3c7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/semian/circuit_breaker.rb b/lib/semian/circuit_breaker.rb
@@ -15,6 +15,8 @@ def initialize(name, exceptions:, success_threshold:, error_threshold:, error_ti
     end
 
     def acquire
+      half_open if open? && error_timeout_expired?
+
       raise OpenCircuitError unless request_allowed?
 
       result = nil
@@ -30,9 +32,7 @@ def acquire
     end
 
     def request_allowed?
-      return true if closed?
-      half_open if error_timeout_expired?
-      !open?
+      closed? || half_open? || (open? && error_timeout_expired?)
     end
 
     def mark_failed(_error)