semian 0.11.7 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e136dd51d96e89f74e2ea3b4d838a86a265dd097c44c61601daa35dbdf60aba0
-  data.tar.gz: 9f42e7eba02dc6f94547d5a8c98ace41672abc9c4ec4ce093c5c8e4c160163a2
+  metadata.gz: da759d0f61fb02cfc01d7d26182f2d0b1a1be105f310bae112f07f1141c278b1
+  data.tar.gz: 782e6184ff4a169ccd16dea60c0d3bf22b885558c53eb455756516aa5c48addd
 SHA512:
-  metadata.gz: dd3861895b3aaf7de70a693c55276d9fc290cfd51a0460491759d106e0a9b9ea1d72bfbb7c3d31b7cf44bdbde3d2c7ce28742a25032375432c570aef325164da
-  data.tar.gz: 6cad2df1f48a514ee8b0122ce1b15fa9c6af84c76dfa0b435205086f6fd1d70d60c87f00eb33282caffab8bafb4500d5a099e8a4a599d3905064d6f89e555d4b
+  metadata.gz: d19b1bbbd06678f4287ff31aef7297a8036a0f7ab7743e62eb1c697378adddbe8ed182eb7f7c6855b98874a8b8a53a706b54fe6e75e1b06db3c3963d604a3e37
+  data.tar.gz: 3d661891b20e8ccd1aad67b26a192229133e91d7d1ccd340eb38515010c4dbdc7987d89c9cd293b2c3ec06068417a3d45ee5d5003e3e02a0c58a0ea6a98122f8

data/lib/semian/adapter.rb

@@ -57,7 +57,7 @@ module Semian
     end
 
     def resource_exceptions
-      []
+      raise NotImplementedError.new("Semian adapters must implement a `resource_exceptions` method")
     end
 
     def resource_already_acquired?

data/lib/semian/circuit_breaker.rb

@@ -7,10 +7,11 @@ module Semian
     attr_reader :name, :half_open_resource_timeout, :error_timeout, :state, :last_error
 
     def initialize(name, exceptions:, success_threshold:, error_threshold:,
-                         error_timeout:, implementation:, half_open_resource_timeout: nil)
+                         error_timeout:, implementation:, half_open_resource_timeout: nil, error_threshold_timeout: nil)
       @name = name.to_sym
       @success_count_threshold = success_threshold
       @error_count_threshold = error_threshold
+      @error_threshold_timeout = error_threshold_timeout || error_timeout
       @error_timeout = error_timeout
       @exceptions = exceptions
       @half_open_resource_timeout = half_open_resource_timeout
@@ -124,7 +125,7 @@ module Semian
     end
 
     def push_time(window, time: Time.now)
-      window.reject! { |err_time| err_time + @error_timeout < time.to_i }
+      window.reject! { |err_time| err_time + @error_threshold_timeout < time.to_i }
       window << time.to_i
     end
 

data/lib/semian/mysql2.rb

@@ -101,6 +101,11 @@ module Semian
 
     private
 
+    EXCEPTIONS = [].freeze
+    def resource_exceptions
+      EXCEPTIONS
+    end
+
     def query_whitelisted?(sql, *)
       QUERY_WHITELIST =~ sql
     rescue ArgumentError

data/lib/semian/rails.rb

@@ -2,6 +2,8 @@ require 'active_record/connection_adapters/abstract_adapter'
 
 class ActiveRecord::ConnectionAdapters::AbstractAdapter
   def semian_resource
-    @connection.semian_resource
+    # support for https://github.com/rails/rails/commit/d86fd6415c0dfce6fadb77e74696cf728e5eb76b
+    connection = instance_variable_defined?(:@raw_connection) ? @raw_connection : @connection
+    connection.semian_resource
   end
 end

data/lib/semian/redis.rb

@@ -138,7 +138,7 @@ module Semian
 
     def raise_if_out_of_memory(reply)
       return unless reply.is_a?(::Redis::CommandError)
-      return unless reply.message =~ /OOM command not allowed when used memory > 'maxmemory'\.\s*\z/
+      return unless reply.message.start_with?("OOM ")
       raise ::Redis::OutOfMemoryError.new(reply.message)
     end
 

data/lib/semian/redis_client.rb

@@ -0,0 +1,111 @@
+require 'semian/adapter'
+require 'redis-client'
+
+class RedisClient
+  ConnectionError.include(::Semian::AdapterError)
+
+  class SemianError < ConnectionError
+    def initialize(semian_identifier, *args)
+      super(*args)
+      @semian_identifier = semian_identifier
+    end
+  end
+
+  ResourceBusyError = Class.new(SemianError)
+  CircuitOpenError = Class.new(SemianError)
+
+  module SemianConfig
+    attr_reader :raw_semian_options
+
+    def initialize(semian: nil, **kwargs)
+      super(**kwargs)
+
+      @raw_semian_options = semian
+    end
+
+    def semian_identifier
+      @semian_identifier ||= begin
+        name = (semian_options && semian_options[:name]) || "#{host}:#{port}/#{db}"
+        :"redis_#{name}"
+      end
+    end
+
+    define_method(:semian_options, Semian::Adapter.instance_method(:semian_options))
+  end
+
+  Config.include(SemianConfig)
+  SentinelConfig.include(SemianConfig)
+end
+
+module Semian
+  module RedisClientCommon
+    def with_resource_timeout(temp_timeout)
+      connect_timeout = self.connect_timeout
+      read_timeout = self.read_timeout
+      write_timeout = self.write_timeout
+
+      begin
+        self.timeout = temp_timeout
+        yield
+      ensure
+        self.connect_timeout = connect_timeout
+        self.read_timeout = read_timeout
+        self.write_timeout = write_timeout
+      end
+    end
+
+    def semian_identifier
+      config.semian_identifier
+    end
+
+    private
+
+    def semian_options
+      config.semian_options
+    end
+
+    def raw_semian_options
+      config.raw_semian_options
+    end
+  end
+
+  module RedisClient
+    EXCEPTIONS = [::RedisClient::ConnectionError]
+
+    include Semian::Adapter
+    include RedisClientCommon
+
+    private
+
+    def resource_exceptions
+      EXCEPTIONS
+    end
+
+    def ensure_connected(retryable: true)
+      if block_given?
+        super do |connection|
+          acquire_semian_resource(adapter: :redis_client, scope: :query) do
+            yield connection
+          end
+        end
+      else
+        super
+      end
+    end
+
+    def connect
+      acquire_semian_resource(adapter: :redis_client, scope: :connection) do
+        super
+      end
+    end
+  end
+
+  module RedisClientPool
+    include RedisClientCommon
+    define_method(:semian_resource, Semian::Adapter.instance_method(:semian_resource))
+    define_method(:clear_semian_resource, Semian::Adapter.instance_method(:clear_semian_resource))
+    end
+end
+
+RedisClient.prepend(Semian::RedisClient)
+RedisClient::Pooled.prepend(Semian::RedisClient)

data/lib/semian/version.rb

@@ -1,3 +1,3 @@
 module Semian
-  VERSION = '0.11.7'
+  VERSION = '0.12.0'
 end

data/lib/semian.rb

@@ -190,6 +190,11 @@ module Semian
     end
   end
 
+  def destroy_all_resources
+    resources.values.each(&:destroy)
+    resources.clear
+  end
+
   # Unregister will not destroy the semian resource, but it will
   # remove it from the hash of registered resources, and decrease
   # the number of registered workers.
@@ -257,6 +262,7 @@ module Semian
       name,
       success_threshold: options[:success_threshold],
       error_threshold: options[:error_threshold],
+      error_threshold_timeout: options[:error_threshold_timeout],
       error_timeout: options[:error_timeout],
       exceptions: Array(exceptions) + [::Semian::BaseError],
       half_open_resource_timeout: options[:half_open_resource_timeout],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.12.0
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -110,6 +110,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +239,7 @@ files:
 - lib/semian/protected_resource.rb
 - lib/semian/rails.rb
 - lib/semian/redis.rb
+- lib/semian/redis_client.rb
 - lib/semian/resource.rb
 - lib/semian/simple_integer.rb
 - lib/semian/simple_sliding_window.rb