semian 0.11.9 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a55808808dfd488dd16eaf8f20326f05c7abc82ea4ffe36b6f6f0e9f76075351
-  data.tar.gz: 5650b7114198219130829324dee4ce139bc99eb886b1c0a54de3c5ee11a1a933
+  metadata.gz: da759d0f61fb02cfc01d7d26182f2d0b1a1be105f310bae112f07f1141c278b1
+  data.tar.gz: 782e6184ff4a169ccd16dea60c0d3bf22b885558c53eb455756516aa5c48addd
 SHA512:
-  metadata.gz: 90c79812e0f790237543afb9ba080c7aed46dd2118df5d1610663e2d53908b6f5ef28aba6686cddddfdc0697a081712bc78c2b673ddc7c8e71f03ef9787908a0
-  data.tar.gz: 5a29bdafa94979ce8ee2f292536ec4a31366af2e9194f02085746682d76f22762c30fad5113073b9a6b2c898649a6b00feb570641937d5361fd6b36b7fa28878
+  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/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/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.9'
+  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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.11.9
+  version: 0.12.0
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-01 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