redis-activesupport 5.0.7 → 5.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a846eea37c0ff4100e7d31590cf05e621192ae2
-  data.tar.gz: b02058a9fc69299ec9306796df202d64e1c6f4d7
+  metadata.gz: 9e2dae1b761efefc450f3d0058ac0e4079b7e3cc
+  data.tar.gz: 066cc4f56fa42e97f9b0d83c04cdc5bb70062dd3
 SHA512:
-  metadata.gz: ff311cba47a47387cab50b61b6f62f3f01428828e0c1a446040e752fdebc9e3494317413e52d7058805d162fbeccc5c4c6c7d5b2fbd2d632efaf8720266a72e4
-  data.tar.gz: 9f6b6d1a4c639ded371d22afeee967896a0917644cf4e42cc321c39e6ac071ffd0b1dc0b958d0a0db6311f81e00818d1fe7e9a1dafbc7bc5f350ed614edd4a4c
+  metadata.gz: 94636bbc45b68dfa930864d90d090d9bef4e7bd2bb59e114f5efe06bd3f3f18cfdf474e34fe9e7f4bf9b15ab5b51c42aad4a3ad12b9a374fe6311e0c78c661da
+  data.tar.gz: c1ebf00acb907f9d5047d8cab835c0d76e78e91a01355e0fe25f2e754b294d83118398db3c4b690b5c3194b25875182cf1e4b2c2ef5e0c27a5f49744682f6f4e

data/.travis.yml

@@ -14,10 +14,19 @@ matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
+  exclude:
     - rvm: 2.0
-      gemfile: gemfiles/Gemfile.activesupport-5.x
+      gemfile: gemfiles/activesupport_50.gemfile
     - rvm: 2.1
-      gemfile: gemfiles/Gemfile.activesupport-5.x
+      gemfile: gemfiles/activesupport_50.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/activesupport_51.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/activesupport_51.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/activesupport_52.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/activesupport_52.gemfile
 notifications:
   webhooks: https://www.travisbuddy.com/
   on_success: never

data/lib/active_support/cache/redis_store.rb

@@ -13,6 +13,12 @@ module ActiveSupport
         Redis::BaseConnectionError
       ].freeze
 
+      DEFAULT_ERROR_HANDLER = -> (method: nil, returning: nil, exception: nil) do
+        if logger
+          logger.error { "RedisStore: #{method} failed, returned #{returning.inspect}: #{exception.class}: #{exception.message}" }
+        end
+      end
+
       attr_reader :data
 
       # Instantiate the store.
@@ -65,16 +71,18 @@ module ActiveSupport
                   ::Redis::Store::Factory.create(*addresses, @options)
                 end
 
+        @error_handler = @options[:error_handler] || DEFAULT_ERROR_HANDLER
+
         super(@options)
       end
 
       def write(name, value, options = nil)
         options = merged_options(options)
         instrument(:write, name, options) do |payload|
-          entry = options[:raw].present? ? value : Entry.new(value, options)
           if options[:expires_in].present? && options[:race_condition_ttl].present? && options[:raw].blank?
             options[:expires_in] = options[:expires_in].to_f + options[:race_condition_ttl].to_f
           end
+          entry = options[:raw].present? ? value : Entry.new(value, options)
           write_entry(normalize_key(name, options), entry, options)
         end
       end
@@ -91,14 +99,13 @@ module ActiveSupport
       def delete_matched(matcher, options = nil)
         options = merged_options(options)
         instrument(:delete_matched, matcher.inspect) do
-          matcher = key_matcher(matcher, options)
-          begin
-            with do |store|
-              !(keys = store.keys(matcher)).empty? && store.del(*keys)
+          failsafe(:read_multi, returning: false) do
+            matcher = key_matcher(matcher, options)
+            begin
+              with do |store|
+                !(keys = store.keys(matcher)).empty? && store.del(*keys)
+              end
             end
-          rescue *ERRORS_TO_RESCUE
-            raise if raise_errors?
-            false
           end
         end
       end
@@ -118,16 +125,15 @@ module ActiveSupport
         args.flatten!
 
         instrument(:read_multi, names) do |payload|
-          values = with { |c| c.mget(*args) }
-          values.map! { |v| v.is_a?(ActiveSupport::Cache::Entry) ? v.value : v }
+          failsafe(:read_multi, returning: {}) do
+            values = with { |c| c.mget(*args) }
+            values.map! { |v| v.is_a?(ActiveSupport::Cache::Entry) ? v.value : v }
 
-          Hash[names.zip(values)].reject{|k,v| v.nil?}.tap do |result|
-            payload[:hits] = result.keys if payload
+            Hash[names.zip(values)].reject{|k,v| v.nil?}.tap do |result|
+              payload[:hits] = result.keys if payload
+            end
           end
         end
-      rescue *ERRORS_TO_RESCUE
-        raise if raise_errors?
-        {}
       end
 
       def fetch_multi(*names)
@@ -147,7 +153,7 @@ module ActiveSupport
           memo
         end
 
-        begin
+        failsafe(:fetch_multi_write) do
           with do |c|
             c.multi do
               need_writes.each do |name, value|
@@ -155,8 +161,6 @@ module ActiveSupport
               end
             end
           end
-        rescue *ERRORS_TO_RESCUE
-          raise if raise_errors?
         end
 
         fetched
@@ -186,7 +190,9 @@ module ActiveSupport
       def increment(key, amount = 1, options = {})
         options = merged_options(options)
         instrument(:increment, key, :amount => amount) do
-          with{|c| c.incrby normalize_key(key, options), amount}
+          failsafe(:increment) do
+            with{|c| c.incrby normalize_key(key, options), amount}
+          end
         end
       end
 
@@ -214,7 +220,9 @@ module ActiveSupport
       def decrement(key, amount = 1, options = {})
         options = merged_options(options)
         instrument(:decrement, key, :amount => amount) do
-          with{|c| c.decrby normalize_key(key, options), amount}
+          failsafe(:decrement) do
+            with{|c| c.decrby normalize_key(key, options), amount}
+          end
         end
       end
 
@@ -226,7 +234,9 @@ module ActiveSupport
       # Clear all the data from the store.
       def clear
         instrument(:clear, nil, nil) do
-          with(&:flushdb)
+          failsafe(:clear) do
+            with(&:flushdb)
+          end
         end
       end
 
@@ -255,20 +265,18 @@ module ActiveSupport
 
       protected
         def write_entry(key, entry, options)
-          method = options && options[:unless_exist] ? :setnx : :set
-          with { |client| client.send method, key, entry, options }
-        rescue *ERRORS_TO_RESCUE
-          raise if raise_errors?
-          false
+          failsafe(:write_entry, returning: false) do
+            method = options && options[:unless_exist] ? :setnx : :set
+            with { |client| client.send method, key, entry, options }
+          end
         end
 
         def read_entry(key, options)
-          entry = with { |c| c.get key, options }
-          return unless entry
-          entry.is_a?(Entry) ? entry : Entry.new(entry)
-        rescue *ERRORS_TO_RESCUE
-          raise if raise_errors?
-          nil
+          failsafe(:read_entry) do
+            entry = with { |c| c.get key, options }
+            return unless entry
+            entry.is_a?(Entry) ? entry : Entry.new(entry)
+          end
         end
 
         ##
@@ -277,10 +285,9 @@ module ActiveSupport
         # It's really needed and use
         #
         def delete_entry(key, options)
-          with { |c| c.del key }
-        rescue *ERRORS_TO_RESCUE
-          raise if raise_errors?
-          false
+          failsafe(:delete_entry, returning: false) do
+            with { |c| c.del key }
+          end
         end
 
         def raise_errors?
@@ -305,12 +312,27 @@ module ActiveSupport
         end
 
       private
-
         if ActiveSupport::VERSION::MAJOR < 5
           def normalize_key(*args)
             namespaced_key(*args)
           end
         end
+
+        def failsafe(method, returning: nil)
+          yield
+        rescue ::Redis::BaseConnectionError => e
+          raise if raise_errors?
+          handle_exception(exception: e, method: method, returning: returning)
+          returning
+        end
+
+        def handle_exception(exception: nil, method: nil, returning: nil)
+          if @error_handler
+            @error_handler.(method: method, exception: exception, returning: returning)
+          end
+        rescue => failsafe
+          warn("RedisStore ignored exception in handle_exception: #{failsafe.class}: #{failsafe.message}\n  #{failsafe.backtrace.join("\n  ")}")
+        end
     end
   end
 end

data/lib/redis/active_support/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module ActiveSupport
-    VERSION = '5.0.7'
+    VERSION = '5.2.0.pre'
   end
 end

data/test/active_support/cache/redis_store_test.rb

@@ -377,7 +377,7 @@ describe ActiveSupport::Cache::RedisStore do
 
   describe "race_condition_ttl on fetch" do
     it "persist entry for longer than given ttl" do
-      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds }
+      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds, version: Time.now.to_i }
       @store.fetch("rabbit", options) { @rabbit }
       sleep 1.1
       @store.delete("rabbit").must_equal(1)
@@ -385,12 +385,12 @@ describe ActiveSupport::Cache::RedisStore do
 
     it "limits stampede time to read-write duration" do
       first_rabbit = second_rabbit = nil
-      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds }
+      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds, version: Time.now.to_i }
       @store.fetch("rabbit", options) { @rabbit }
       sleep 1
 
       th1 = Thread.new do
-        first_rabbit = @store.fetch("rabbit", race_condition_ttl: 2) do
+        first_rabbit = @store.fetch("rabbit", options) do
           sleep 1
           @white_rabbit
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 5.0.7
+  version: 5.2.0.pre
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
@@ -196,9 +196,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: redis-activesupport
 rubygems_version: 2.6.14