redis-reconnect_with_readonly 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85ea1bdc6974e919bd9c1e8489ab468c94a45177
-  data.tar.gz: dae0a9aac547e3b4a167dfc377f9941cb5619309
+  metadata.gz: 1b4061788f20bca31f019b8768df6d3170635c02
+  data.tar.gz: e5f7e654372eb55d40e3f6edc96daafc747ecccd
 SHA512:
-  metadata.gz: 3dda7397c1be54f2d14cc69db36f7161ca6c803f4a9f651491c469d69a3d0e6a31a7dc8ed6517436f7cd58a54568927af482fefe181563216ed964396e98f338
-  data.tar.gz: c018f556bb3e88278da33e880cf3565acb2e7004b3118fd5720e65d39434f0be1896d8c158975441bcedc15e629fcf02fa6f2741cda39c064b886259c182ed41
+  metadata.gz: 4d570f5e027a44faa2330eb28140e1c6732adccbab836613d7f8a5587c2d685806110d93313ed4b7121ddf02c4b010eadebf154f0ebf0b805328cfcf4280bff5
+  data.tar.gz: fb346107919e998637c6a31bae03ff8ab44b6cad7e5fcf5c9d9355c634a410643a481aee3f9cded50c4ad9e998cae1d9c48894d1d282f33fcafad9e7a4231965

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.9.3 (2016-08-28)
+
+Fixes:
+
+* raise e on give up
+
 # 0.9.2 (2016-08-28)
 
 Enhancements:

data/lib/redis/reconnect_with_readonly.rb

@@ -12,34 +12,35 @@ class Redis
 
     class << self
       attr_accessor :reconnect_attempts, :initial_retry_wait, :max_retry_wait, :logger
+    end
 
-      def reconnect_with_readonly(redis, &block)
-        retries = 0
-        begin
-          yield block
-        rescue CommandError => e
-          if e.message =~ /READONLY/
-            if retries < reconnect_attempts
-              wait = initial_retry_wait * retries
-              wait = [wait, max_retry_wait].min if max_retry_wait
-              logger.info {
-                "Reconnect with readonly: #{e.message} " \
-                "(retries: #{retries}/#{reconnect_attempts}) (wait: #{wait}sec)"
-              } if logger
-              sleep wait
-              retries += 1
-              redis.disconnect
-              logger.debug { "Reconnect with readonly: disconnected and retry" } if logger
-              retry
-            else
-              logger.info {
-                "Reconnect with readonly: Give up " \
-                "(retries: #{retries}/#{reconnect_attempts})"
-              } if logger
-            end
+    def self.reconnect_with_readonly(redis, &block)
+      retries = 0
+      begin
+        yield block
+      rescue CommandError => e
+        if e.message =~ /READONLY/
+          if retries < reconnect_attempts
+            wait = initial_retry_wait * retries
+            wait = [wait, max_retry_wait].min if max_retry_wait
+            logger.info {
+              "Reconnect with readonly: #{e.message} " \
+              "(retries: #{retries}/#{reconnect_attempts}) (wait: #{wait}sec)"
+            } if logger
+            sleep wait
+            retries += 1
+            redis.disconnect
+            logger.debug { "Reconnect with readonly: disconnected and retry" } if logger
+            retry
           else
-            raise
+            logger.info {
+              "Reconnect with readonly: Give up " \
+              "(retries: #{retries}/#{reconnect_attempts})"
+            } if logger
+            raise e
           end
+        else
+          raise e
         end
       end
     end

data/lib/redis/reconnect_with_readonly/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class ReconnectWithReadonly
-    VERSION = "0.9.2"
+    VERSION = "0.9.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-reconnect_with_readonly
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Naotoshi Seo