cb2 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTE5OWQ3ZDliNTg4OGUyNjU4YTNiOGVkM2FjNzAwM2VkMTdiZWU4Zg==
-  data.tar.gz: !binary |-
-    ZDEzYjJjMTA5YTIxZDE2MDRkOWRiNzk0ZjQ3NDlkYzZhMmYwOTdiMA==
+SHA1:
+  metadata.gz: 7745238479e3b771cd4250afd72b38628690b89c
+  data.tar.gz: 4a52b01231637cbfce2e2ab95f5a1ef05137a525
 SHA512:
-  metadata.gz: !binary |-
-    YTg1OGMwZjYzYTk5NTQ0NTQ4MDY2M2ZmNGZmOGZjZGQ4NmNjNmYwNGE4ZWRh
-    MjQyYjRlZTJhNDFiMDIzYzQxZjRjNTU4YTQzNDNjMzAzZTk1NzZhNmQ1MWZh
-    ZWI5MmFmN2MxMTEzOTczZWY0MGMwOWIwMzMyNWM0ZmJmNjgyYmQ=
-  data.tar.gz: !binary |-
-    MWQwYjA0Mzk1NTgxYWRiZmVkZmYwYzZlMDY5NTkwYTBlYWEzZDk5Mjc3ZTNl
-    MmE2ZjFmYTczODlmNjMyZWQyZTIyZmEyY2Y2OWNiMjU2MzczMDQ2MDBmYmYz
-    ZGRhZmNlMWNlMTkxZjQ2OGQyMjdlYjEzMzUzOGRjNWM2ZTU2NzE=
+  metadata.gz: 050ca6b08571141c02da98e85a064f76039955e180e14ddae4b071dfbb18fe6f3da4077e705f9809e9576e9553dd0b971c6241368736dfbaba93f3ec6412ccea
+  data.tar.gz: 8b21fa54a558a8cb7caf67f6c22c37d05aa208505913bcfcfeb98cedbfc1732dd64044cc315478166410e37667af23bdcbab8e04d25b79731511e9aa3c67d8c4

data/lib/cb2/breaker.rb

@@ -13,11 +13,14 @@ class CB2::Breaker
 
     begin
       process_count
-      yield
+      ret = yield
+      process_success
     rescue => e
       process_error
       raise e
     end
+
+    return ret
   end
 
   def open?
@@ -31,6 +34,11 @@ class CB2::Breaker
   rescue Redis::BaseError
   end
 
+  def process_success
+    strategy.success if strategy.respond_to?(:success)
+  rescue Redis::BaseError
+  end
+
   def process_error
     strategy.error if strategy.respond_to?(:error)
   rescue Redis::BaseError

data/lib/cb2/strategies/percentage.rb

@@ -1,5 +1,5 @@
 class CB2::Percentage < CB2::RollingWindow
-  # keep a rolling window of successful calls too
+  # keep a rolling window of all calls too
   def count
     @current_count = increment_rolling_window(key("count"))
   end

data/lib/cb2/strategies/rolling_window.rb

@@ -10,14 +10,10 @@ class CB2::RollingWindow
   end
 
   def open?
+    @last_open = nil # always fetch the latest value from redis here
     last_open && last_open.to_i > (Time.now.to_i - reenable_after)
   end
 
-  def open!
-    @last_open = Time.now.to_i
-    redis.set(key, @last_open)
-  end
-
   def half_open?
     last_open && last_open.to_i < (Time.now.to_i - reenable_after)
   end
@@ -26,13 +22,29 @@ class CB2::RollingWindow
     @last_open ||= redis.get(key)
   end
 
+  def success
+    if half_open?
+      reset!
+    end
+  end
+
   def error
     count = increment_rolling_window(key("error"))
     if half_open? || should_open?(count)
-      open!
+      trip!
     end
   end
 
+  def reset!
+    @last_open = nil
+    redis.del(key)
+  end
+
+  def trip!
+    @last_open = Time.now.to_i
+    redis.set(key, @last_open)
+  end
+
   # generate a key to use in redis
   def key(id=nil)
     postfix = id ? "-#{id}" : ""

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: cb2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Pedro Belo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Implementation of the circuit breaker pattern in Ruby
@@ -103,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Circuit breaker