cb2 0.0.2 → 0.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTE5OWQ3ZDliNTg4OGUyNjU4YTNiOGVkM2FjNzAwM2VkMTdiZWU4Zg==
-  data.tar.gz: !binary |-
-    ZDEzYjJjMTA5YTIxZDE2MDRkOWRiNzk0ZjQ3NDlkYzZhMmYwOTdiMA==
+SHA256:
+  metadata.gz: a8af2405e21658d0d99e3d8b2a694e94c7e46201ec10bb738af3e78c50685668
+  data.tar.gz: 0cbdd27e23854ffbdfd5125c4dbbfcf8d6b546c5b4b07b964cdd7b5af1ff0d49
 SHA512:
-  metadata.gz: !binary |-
-    YTg1OGMwZjYzYTk5NTQ0NTQ4MDY2M2ZmNGZmOGZjZGQ4NmNjNmYwNGE4ZWRh
-    MjQyYjRlZTJhNDFiMDIzYzQxZjRjNTU4YTQzNDNjMzAzZTk1NzZhNmQ1MWZh
-    ZWI5MmFmN2MxMTEzOTczZWY0MGMwOWIwMzMyNWM0ZmJmNjgyYmQ=
-  data.tar.gz: !binary |-
-    MWQwYjA0Mzk1NTgxYWRiZmVkZmYwYzZlMDY5NTkwYTBlYWEzZDk5Mjc3ZTNl
-    MmE2ZjFmYTczODlmNjMyZWQyZTIyZmEyY2Y2OWNiMjU2MzczMDQ2MDBmYmYz
-    ZGRhZmNlMWNlMTkxZjQ2OGQyMjdlYjEzMzUzOGRjNWM2ZTU2NzE=
+  metadata.gz: e8ea4cbff5fc9a88d066f1fe551bd26ddbdaa93e0c7db04b4ca3dbcf8128520f4fc7e7e22a93c6e5878227b96c5483de60009453fc2124033485ea398f11c109
+  data.tar.gz: 793da2f7ddd54249515b66d619885c22f30eda34a2d6c1defb2749dd509c478d9ba3fc621be35968ea956067b9c6a60169250b39e6410d9b6442e82ab71896ea

data/Gemfile.lock

@@ -1,36 +1,46 @@
 PATH
   remote: .
   specs:
-    cb2 (0.0.2)
-      redis (~> 3.1)
+    cb2 (0.0.4)
+      redis (~> 5, >= 4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.2.5)
-    rake (10.3.2)
-    redis (3.1.0)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
+    minitest (5.18.1)
+    rake (13.0.6)
+    redis (5.2.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.2)
+      connection_pool
     rr (1.1.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    timecop (0.7.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    timecop (0.9.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cb2!
+  minitest (> 0)
   rake (> 0)
   rr (~> 1.1)
   rspec (~> 3.1)
-  timecop (~> 0.7)
+  timecop (> 0)
+
+BUNDLED WITH
+   2.3.26

data/lib/cb2/breaker.rb

@@ -8,16 +8,19 @@ class CB2::Breaker
 
   def run
     if open?
-      raise CB2::BreakerOpen
+      raise CB2::BreakerOpen.new("#{service} breaker open")
     end
 
     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

@@ -6,18 +6,14 @@ class CB2::RollingWindow
     @duration       = options.fetch(:duration)
     @threshold      = options.fetch(:threshold)
     @reenable_after = options.fetch(:reenable_after)
-    @redis          = options[:redis] || Redis.current
+    @redis          = options[:redis] || Redis.new
   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}" : ""
@@ -42,16 +54,17 @@ class CB2::RollingWindow
   protected
 
   def increment_rolling_window(key)
-    t   = Time.now.to_i
-    pipeline = redis.pipelined do
+    t = Time.now.to_i
+    result = redis.pipelined do |pipeline|
       # keep the sorted set clean
-      redis.zremrangebyscore(key, "-inf", t - duration)
+      pipeline.zremrangebyscore(key, "-inf", t - duration)
       # add as a random uuid because sorted sets won't take duplicate items:
-      redis.zadd(key, t, SecureRandom.uuid)
+      pipeline.zadd(key, t, SecureRandom.uuid)
       # just count how many errors are left in the set
-      redis.zcard(key)
+      pipeline.zcard(key)
     end
-    return pipeline.last # return the count
+
+    result.last # return the count
   end
 
   def should_open?(error_count)

data/lib/cb2.rb

@@ -1,4 +1,5 @@
 require "redis"
+require "securerandom"
 
 module CB2
 end

metadata

@@ -1,87 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: cb2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Pedro Belo
-autorequire: 
+- Matt Rohrer
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2024-05-22 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'
+        version: '5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
 - !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: minitest
+  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: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 description: Implementation of the circuit breaker pattern in Ruby
-email: pedrobelo@gmail.com
+email: matt@prognostikos.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -94,28 +115,27 @@ files:
 - lib/cb2/strategies/percentage.rb
 - lib/cb2/strategies/rolling_window.rb
 - lib/cb2/strategies/stub.rb
-homepage: http://github.com/pedro/cb2
-licenses: []
+homepage: http://github.com/prognostikos/cb2
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: Circuit breaker
 test_files: []
-has_rdoc: