semian 0.13.0 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f862d0b3bcde3015576c4965229c14d188683f16c567256df7cf915c692874
-  data.tar.gz: e03971099a9f6b605c8dc73abe332f91908467dd24e2cb4bd0ba1f802e3f249d
+  metadata.gz: b572c4e4fa4dee4453017187bc759a29890dca1627f8bebea6207223e58e49ba
+  data.tar.gz: f8b7f8eda600b096242becc44cb80a10592d9a9b2490349eecb5c11a008c0fe0
 SHA512:
-  metadata.gz: a23498d15ccb457f76c4f7afbb858deed86aedc7fb97605b198578714aace1e14390c84be367add408b7b444e3350c7cce117dc608750b413e085ce10c06ed44
-  data.tar.gz: 47e0f1be5613745ed37a6854ab82979e94eba4e53deb187035678dbdc4f3e781d5db9a97c2e34e7eef0386d6344cba1f34948a03252d058a50f600f7a96a438c
+  metadata.gz: 30c39a27e0e57ddcccc794fbe9cc04f1d84c864c1cd2786bb2e4e6e7050b51f152feeba8c66c59d1feae3c195b93a921a76aa1985dc034f00e3394d6b4cb3123
+  data.tar.gz: 922ba4aa39b90898b84cb301ee28344e5cfe8f57b523e531db24bba2bee3731d55dda0256bf7dd923fe33175daad960a93a1090addad68a448e6fe384a6a8c42

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Unreleased
 
+# v0.13.3
+
+* Add a warning message about redis 5.x. (#386)
+
+# v0.13.2
+
+* Fix: Update AbstractAdapter patch to accomodate recent Rails changes. (#364)
+
+# v0.13.1
+
+* Fix: Raise `Redis::OutOfMemoryError` for messages that match `OOM command not allowed when used memory > 'maxmemory'` rather than checking `start_with?("OOM ")`. (#367)
+
 # v0.13.0
 
 * Refactor: Replace Time.now with CLOCK_MONOTONIC in MockServer (#318)

data/lib/semian/mysql2.rb

@@ -43,16 +43,18 @@ module Semian
       %r{\A(?:/\*.*?\*/)?\s*RELEASE\s+SAVEPOINT}i,
     )
 
-    # The naked methods are exposed as `raw_query` and `raw_connect` for instrumentation purpose
-    def self.included(base)
-      base.send(:alias_method, :raw_query, :query)
-      base.send(:remove_method, :query)
+    class << self
+      # The naked methods are exposed as `raw_query` and `raw_connect` for instrumentation purpose
+      def included(base)
+        base.send(:alias_method, :raw_query, :query)
+        base.send(:remove_method, :query)
 
-      base.send(:alias_method, :raw_connect, :connect)
-      base.send(:remove_method, :connect)
+        base.send(:alias_method, :raw_connect, :connect)
+        base.send(:remove_method, :connect)
 
-      base.send(:alias_method, :raw_ping, :ping)
-      base.send(:remove_method, :ping)
+        base.send(:alias_method, :raw_ping, :ping)
+        base.send(:remove_method, :ping)
+      end
     end
 
     def semian_identifier

data/lib/semian/rails.rb

@@ -2,14 +2,35 @@
 
 require "active_record/connection_adapters/abstract_adapter"
 
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractAdapter
-      def semian_resource
-        # support for https://github.com/rails/rails/commit/d86fd6415c0dfce6fadb77e74696cf728e5eb76b
-        connection = instance_variable_defined?(:@raw_connection) ? @raw_connection : @connection
-        connection.semian_resource
+module Semian
+  module Rails
+    def semian_resource
+      @semian_resource ||= client_connection.semian_resource
+    end
+
+    def reconnect
+      @semian_resource = nil
+      super
+    end
+
+    private
+
+    # client_connection is an instance of a Mysql2::Client
+    #
+    # The conditionals here support multiple Rails versions.
+    #   - valid_raw_connection is for 7.1.x and above
+    #   - @raw_connection is for 7.0.x
+    #   - @connection is for versions below 6.1.x and below
+    def client_connection
+      if respond_to?(:valid_raw_connection)
+        valid_raw_connection
+      elsif instance_variable_defined?(:@raw_connection)
+        @raw_connection
+      else
+        @connection
       end
     end
   end
 end
+
+ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(Semian::Rails)

data/lib/semian/redis.rb

@@ -3,6 +3,11 @@
 require "semian/adapter"
 require "redis"
 
+if Redis::VERSION >= "5.0.0"
+  Semian.logger.warn("NOTE: Semian is not compatible with Redis 5.x")
+  return
+end
+
 class Redis
   Redis::BaseConnectionError.include(::Semian::AdapterError)
   ::Errno::EINVAL.include(::Semian::AdapterError)
@@ -65,13 +70,15 @@ module Semian
     CircuitOpenError = ::Redis::CircuitOpenError
     ResolveError = ::Redis::ResolveError
 
-    # The naked methods are exposed as `raw_query` and `raw_connect` for instrumentation purpose
-    def self.included(base)
-      base.send(:alias_method, :raw_io, :io)
-      base.send(:remove_method, :io)
+    class << self
+      # The naked methods are exposed as `raw_query` and `raw_connect` for instrumentation purpose
+      def included(base)
+        base.send(:alias_method, :raw_io, :io)
+        base.send(:remove_method, :io)
 
-      base.send(:alias_method, :raw_connect, :connect)
-      base.send(:remove_method, :connect)
+        base.send(:alias_method, :raw_connect, :connect)
+        base.send(:remove_method, :connect)
+      end
     end
 
     def semian_identifier
@@ -139,7 +146,7 @@ module Semian
 
     def raise_if_out_of_memory(reply)
       return unless reply.is_a?(::Redis::CommandError)
-      return unless reply.message.start_with?("OOM ")
+      return unless reply.message =~ /OOM command not allowed when used memory > 'maxmemory'/
 
       raise ::Redis::OutOfMemoryError, reply.message
     end

data/lib/semian/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Semian
-  VERSION = "0.13.0"
+  VERSION = "0.13.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.3
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies: []
 description: |2
       A Ruby C extention that is used to control access to shared resources
@@ -61,7 +61,17 @@ metadata:
   bug_tracker_uri: https://github.com/Shopify/semian/issues
   changelog_uri: https://github.com/Shopify/semian/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/Shopify/semian
-post_install_message: 
+post_install_message: |2+
+
+  ==============================================================================
+
+  semians is not compatible with redis 5.x.
+  Update Gemfile to use older redis version:
+
+      gem "redis", "~> 4.8"
+
+  ==============================================================================
+
 rdoc_options: []
 require_paths:
 - lib