knifeswitch 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21ca91eae9b7d22ebef28c43b90429e6e1c5e10501fd39e54eefffec2f2ef45
-  data.tar.gz: 5faa4bc86e93ad8dbff72095b2f4da97adeb8e54ebc9d0ec8191b4db0c7999ea
+  metadata.gz: 0a4ccbfd70b65a64a5dd7ca2b4415776a2edbf69ecff735d264410f52e872c9c
+  data.tar.gz: e05145c272a86defde56a34123049f1e05995c456291a8f3b08c9e8b46728890
 SHA512:
-  metadata.gz: 294756a35f27839e007c34496e550d88e95979f0252f1532536b06851de52c87f7f0fcf8f51e384976189a728a1c6d91b1f9dcb1fea918955ff022a1d16485c0
-  data.tar.gz: 94bc6838ab85d95ca0bc42a5ca131e487d63dbeaa67f2c5075b9d482418b08ea8a5e363b38e4b5b169d8ee080f33b827c0017754949c20de2acd0928862f13fc
+  metadata.gz: 333b47a38d2c6cfb4a71f9a2fd44a7502e9ca294d93310d31d9279fcce504136ec1b1a5fcbf734a4bb45e9bf4c05479e3687fc2f1b5684bd774f7cb3291ed651
+  data.tar.gz: fdfbfe1d54427f06991127547f6f1a700dd0caba0dffe7de0514e9970eed1a769cc594ac5d53b684f263f88a7b104db3a1460a9925b959c52ca59336c6434f29

data/README.md

@@ -1,4 +1,7 @@
 # Knifeswitch
+
+![knifeswitch](https://user-images.githubusercontent.com/2793160/67077729-c908dd80-f1ca-11e9-96c7-5b1c8b792254.jpg)
+
 Yet another circuit breaker gem. This one strives to be as small and simple as possible. In the effort to remain simple, it currently only supports Rails with MySQL.
 
 ## Usage

data/lib/knifeswitch/circuit.rb

@@ -49,23 +49,38 @@ module Knifeswitch
     #
     # Raises Knifeswitch::CircuitOpen when called while the circuit is open.
     def run
-      if open?
-        callback.try(:call, CircuitOpen.new)
-        raise CircuitOpen
-      end
+      with_connection do
+        if open?
+          callback.try(:call, CircuitOpen.new)
+          raise CircuitOpen
+        end
+
+        begin
+          result = yield
+        rescue Exception => error
+          if exceptions.any? { |watched| error.is_a?(watched) }
+            increment_counter!
+            callback.try(:call, error)
+          else
+            reset_counter!
+          end
+
+          raise error
+        end
 
-      result = yield
-      reset_counter!
-      result
-    rescue Exception => error
-      if exceptions.any? { |watched| error.is_a?(watched) }
-        increment_counter!
-        callback.try(:call, error)
-      else
         reset_counter!
+        result
       end
+    ensure
+      reset_record
+    end
+
+    def closetime
+      record&.dig("closetime")
+    end
 
-      raise error
+    def counter
+      record&.dig("counter") || 0
     end
 
     # Queries the database to see if the circuit is open.
@@ -74,22 +89,7 @@ module Knifeswitch
     # When the circuit is open, calls to `run` will raise CircuitOpen
     # instead of yielding.
     def open?
-      result = sql(:select_value, %(
-        SELECT COUNT(*) c FROM knifeswitch_counters
-        WHERE name = ? AND closetime > ?
-      ), namespace, DateTime.now)
-
-      result > 0
-    end
-
-    # Retrieves the current counter value.
-    def counter
-      result = sql(:select_value, %(
-        SELECT counter FROM knifeswitch_counters
-        WHERE name = ?
-      ), namespace)
-
-      result || 0
+      return closetime && closetime > DateTime.now
     end
 
     # Increments counter and opens the circuit if it went
@@ -117,6 +117,7 @@ module Knifeswitch
 
     # Sets the counter to zero
     def reset_counter!
+      return if counter == 0
       sql(:execute, %(
         INSERT INTO knifeswitch_counters (name,counter)
         VALUES (?, 0)
@@ -126,14 +127,42 @@ module Knifeswitch
 
     private
 
+    def load_record
+      sql(:select_one, %(
+        SELECT counter, closetime FROM knifeswitch_counters
+        WHERE name = ?
+      ), @namespace)
+    end
+
+    def reset_record
+      @record = nil
+    end
+
+    def record
+      @record ||= load_record
+    end
+
     # Executes a SQL query with the given Connection method
     # (i.e. :execute, or :select_values)
     def sql(method, query, *args)
       query = ActiveRecord::Base.send(:sanitize_sql_array, [query] + args)
-
-      ActiveRecord::Base.connection_pool.with_connection do |conn|
+      with_connection do |conn|
         conn.send(method, query)
       end
     end
+
+    def with_connection
+      if @conn
+        yield(@conn)
+      else
+        begin
+          @conn = ActiveRecord::Base.connection_pool.checkout
+          yield(@conn)
+        ensure
+          ActiveRecord::Base.connection_pool.checkin(@conn)
+          @conn = nil
+        end
+      end
+    end
   end
 end

data/lib/knifeswitch/version.rb

@@ -1,3 +1,3 @@
 module Knifeswitch
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knifeswitch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Nigel Baillie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Simple implementation of the circuit breaker pattern.