cb2 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzM2YWYxM2YyMmMxMmQ4NWZkNjczYjM5OGQ3NDBlZTk4MjViODdlNw==
+    ZTE5OWQ3ZDliNTg4OGUyNjU4YTNiOGVkM2FjNzAwM2VkMTdiZWU4Zg==
   data.tar.gz: !binary |-
-    YTcwMzhiMTAyMDk0Mjc5YzZkMWM0MzBmYmQ2OTM2ZGQ2NDJhMTE5OA==
+    ZDEzYjJjMTA5YTIxZDE2MDRkOWRiNzk0ZjQ3NDlkYzZhMmYwOTdiMA==
 SHA512:
   metadata.gz: !binary |-
-    MjYzYzVhNTFhNWJiMDgyMTBhZTMzYTg1Mjk5ZGFkZDRkMzM4MTY2YjdhMGI0
-    YjY2MTJhMDY0MzdkZjAyZTk2M2MxYWFjMTc5OTIyZWY0YjVhYWVmYmU1MmM0
-    ZDNhNWI4NWEwOGVhYmIyNTVmNmZlMDNhMjQwNmU0MTViNzAwMzE=
+    YTg1OGMwZjYzYTk5NTQ0NTQ4MDY2M2ZmNGZmOGZjZGQ4NmNjNmYwNGE4ZWRh
+    MjQyYjRlZTJhNDFiMDIzYzQxZjRjNTU4YTQzNDNjMzAzZTk1NzZhNmQ1MWZh
+    ZWI5MmFmN2MxMTEzOTczZWY0MGMwOWIwMzMyNWM0ZmJmNjgyYmQ=
   data.tar.gz: !binary |-
-    NjY4OWQxMGZhYjI5OWFhYTk2ZWJkZGU4NDgwNTJiMDIyNjRmMmQ3OTk1OTRk
-    ZTcwNjhiM2UxNzEzNzQ2MGFlZDZjNTQ0ZjkwOGUxZjEwYzYzMTgzYzkyNjE4
-    N2UxZTU1ZTBlOGJhZjU4MWEzMzcxZTIwMzllMmFlMjRiMDYwNzQ=
+    MWQwYjA0Mzk1NTgxYWRiZmVkZmYwYzZlMDY5NTkwYTBlYWEzZDk5Mjc3ZTNl
+    MmE2ZjFmYTczODlmNjMyZWQyZTIyZmEyY2Y2OWNiMjU2MzczMDQ2MDBmYmYz
+    ZGRhZmNlMWNlMTkxZjQ2OGQyMjdlYjEzMzUzOGRjNWM2ZTU2NzE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cb2 (0.0.1)
+    cb2 (0.0.2)
       redis (~> 3.1)
 
 GEM
@@ -10,6 +10,7 @@ GEM
     diff-lcs (1.2.5)
     rake (10.3.2)
     redis (3.1.0)
+    rr (1.1.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -30,5 +31,6 @@ PLATFORMS
 DEPENDENCIES
   cb2!
   rake (> 0)
+  rr (~> 1.1)
   rspec (~> 3.1)
   timecop (~> 0.7)

data/lib/cb2.rb

@@ -3,7 +3,8 @@ require "redis"
 module CB2
 end
 
-require "breaker"
-require "error"
-require "strategies/rolling_window"
-require "strategies/stub"
+require "cb2/breaker"
+require "cb2/error"
+require "cb2/strategies/rolling_window"
+require "cb2/strategies/percentage"
+require "cb2/strategies/stub"

data/lib/{breaker.rb → cb2/breaker.rb}

@@ -12,28 +12,43 @@ class CB2::Breaker
     end
 
     begin
+      process_count
       yield
     rescue => e
-      strategy.process
+      process_error
       raise e
     end
   end
 
   def open?
     strategy.open?
+  rescue Redis::BaseError
+    false
+  end
+
+  def process_count
+    strategy.count if strategy.respond_to?(:count)
+  rescue Redis::BaseError
+  end
+
+  def process_error
+    strategy.error if strategy.respond_to?(:error)
+  rescue Redis::BaseError
   end
 
   def initialize_strategy(options)
     strategy_options = options.dup.merge(service: self.service)
 
-    if options[:strategy].respond_to?(:open)
+    if options[:strategy].respond_to?(:open?)
       return options[:strategy].new(strategy_options)
     end
 
-    case options[:strategy]
-    when nil, :rolling_window
+    case options[:strategy].to_s
+    when "", "percentage"
+      CB2::Percentage.new(strategy_options)
+    when "rolling_window"
       CB2::RollingWindow.new(strategy_options)
-    when nil, :stub
+    when "stub"
       CB2::Stub.new(strategy_options)
     end
   end

data/lib/cb2/strategies/percentage.rb

@@ -0,0 +1,16 @@
+class CB2::Percentage < CB2::RollingWindow
+  # keep a rolling window of successful calls too
+  def count
+    @current_count = increment_rolling_window(key("count"))
+  end
+
+  private
+
+  def should_open?(error_count)
+    # do not open until we have a reasonable number of requests
+    return false if @current_count < 5
+
+    error_perc = error_count * 100 / @current_count.to_f
+    return error_perc >= threshold
+  end
+end

data/lib/{strategies → cb2/strategies}/rolling_window.rb

@@ -6,19 +6,42 @@ class CB2::RollingWindow
     @duration       = options.fetch(:duration)
     @threshold      = options.fetch(:threshold)
     @reenable_after = options.fetch(:reenable_after)
-    @redis          = Redis.current
+    @redis          = options[:redis] || Redis.current
   end
 
   def open?
-    redis.exists(cache_key)
+    last_open && last_open.to_i > (Time.now.to_i - reenable_after)
   end
 
   def open!
-    redis.setex(cache_key, reenable_after, 1)
+    @last_open = Time.now.to_i
+    redis.set(key, @last_open)
   end
 
-  def process
-    key = "circuit-breaker-count-#{service}"
+  def half_open?
+    last_open && last_open.to_i < (Time.now.to_i - reenable_after)
+  end
+
+  def last_open
+    @last_open ||= redis.get(key)
+  end
+
+  def error
+    count = increment_rolling_window(key("error"))
+    if half_open? || should_open?(count)
+      open!
+    end
+  end
+
+  # generate a key to use in redis
+  def key(id=nil)
+    postfix = id ? "-#{id}" : ""
+    "cb2-#{service}#{postfix}"
+  end
+
+  protected
+
+  def increment_rolling_window(key)
     t   = Time.now.to_i
     pipeline = redis.pipelined do
       # keep the sorted set clean
@@ -28,14 +51,10 @@ class CB2::RollingWindow
       # just count how many errors are left in the set
       redis.zcard(key)
     end
-    if pipeline.last >= threshold
-      open!
-    end
+    return pipeline.last # return the count
   end
 
-  private
-
-  def cache_key
-    "circuit-breaker-#{service}"
+  def should_open?(error_count)
+    error_count >= threshold
   end
 end

data/lib/{strategies → cb2/strategies}/stub.rb

@@ -8,7 +8,4 @@ class CB2::Stub
   def open?
     !allow
   end
-
-  def process
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cb2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Pedro Belo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>'
       - !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
@@ -74,11 +88,12 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
-- lib/breaker.rb
 - lib/cb2.rb
-- lib/error.rb
-- lib/strategies/rolling_window.rb
-- lib/strategies/stub.rb
+- lib/cb2/breaker.rb
+- lib/cb2/error.rb
+- lib/cb2/strategies/percentage.rb
+- lib/cb2/strategies/rolling_window.rb
+- lib/cb2/strategies/stub.rb
 homepage: http://github.com/pedro/cb2
 licenses: []
 metadata: {}