redis-reconnect_with_readonly 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21d616b3294b61179b1704851f3524c4f0bf1be8
-  data.tar.gz: 7d487051f5cd268ae1a7eb4c4b15245400ed320a
+  metadata.gz: 85ea1bdc6974e919bd9c1e8489ab468c94a45177
+  data.tar.gz: dae0a9aac547e3b4a167dfc377f9941cb5619309
 SHA512:
-  metadata.gz: 6440817029e71d7c7a066f4cdf5a56d9481af40045f064607f04e26a5eea2f8714c91317fbdc10d1ee833acab3304743a65c822f5408013db883780ca5178037
-  data.tar.gz: f35251da92d88a6695311008ba24e659e378ee0a0d2caa3166e603e5ea1d8c6f7deaecbed8ceacb08ee27513dc4d59f24338a994e6587b0548f034c0c9814c7f
+  metadata.gz: 3dda7397c1be54f2d14cc69db36f7161ca6c803f4a9f651491c469d69a3d0e6a31a7dc8ed6517436f7cd58a54568927af482fefe181563216ed964396e98f338
+  data.tar.gz: c018f556bb3e88278da33e880cf3565acb2e7004b3118fd5720e65d39434f0be1896d8c158975441bcedc15e629fcf02fa6f2741cda39c064b886259c182ed41

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.9.2 (2016-08-28)
+
+Enhancements:
+
+* Add logger option
+
 # 0.9.1 (2016-08-26)
 
 Fixes:

data/README.md

@@ -33,9 +33,10 @@ It will wait `initial_retry_wait * number of retries` seconds on each retry.
 The waiting interval can be suppressed up to `max_retry_wait` seconds.
 
 ```
-Redis::ReconnectWithReadonly.reconnect_attempts = 10  # default: 3 (times)
-Redis::ReconnectWithReadonly.initial_retry_wait = 1.0 # default: 0.5 (sec)
-Redis::ReconnectWithReadonly.max_retry_wait     = 5.0 # default: nil which means no max (sec)
+Redis::ReconnectWithReadonly.reconnect_attempts = 10     # default: 3 (times)
+Redis::ReconnectWithReadonly.initial_retry_wait = 1.0    # default: 0.5 (sec)
+Redis::ReconnectWithReadonly.max_retry_wait     = 5.0    # default: nil which means no max (sec)
+Redis::ReconnectWithReadonly.logger = Logger.new(STDOUT) # default: nil
 ```
 
 ## Implementation

data/bin/try

@@ -7,7 +7,7 @@ require 'logger'
 Redis::ReconnectWithReadonly.reconnect_attempts = 5
 Redis::ReconnectWithReadonly.initial_retry_wait = 1
 Redis::ReconnectWithReadonly.max_retry_wait = 3
+Redis::ReconnectWithReadonly.logger = Logger.new(STDOUT)
 
-logger = Logger.new(STDOUT)
-redis = Redis.new(host: 'localhost', port: '6380', logger: logger)
+redis = Redis.new(host: 'localhost', port: '6380')
 redis.set('key', 'val')

data/lib/redis/reconnect_with_readonly.rb

@@ -8,59 +8,60 @@ class Redis
     @reconnect_attempts  = 3
     @initial_retry_wait = 0.5
     @max_retry_wait  = nil
+    @logger = nil
 
     class << self
-      attr_accessor :reconnect_attempts, :initial_retry_wait, :max_retry_wait
-    end
-  end
-end
+      attr_accessor :reconnect_attempts, :initial_retry_wait, :max_retry_wait, :logger
 
-class Redis
-  class Client
-    def reconnect_with_readonly(&block)
-      retries = 0
-      begin
-        yield block
-      rescue CommandError => e
-        if e.message =~ /READONLY/
-          if retries < (max_retries = ReconnectWithReadonly.reconnect_attempts)
-            wait = ReconnectWithReadonly.initial_retry_wait * retries
-            wait = [wait, ReconnectWithReadonly.max_retry_wait].min if ReconnectWithReadonly.max_retry_wait
-            logger.info {
-              "Reconnect with readonly: #{e.message} " \
-              "(retries: #{retries}/#{max_retries}) (wait: #{wait}sec)"
-            } if logger
-            sleep wait
-            retries += 1
-            disconnect
-            logger.debug { "Reconnect with readonly: disconnected and retry" } if logger
-            retry
+      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
           else
-            logger.info {
-              "Reconnect with readonly: Give up " \
-              "(retries: #{retries}/#{max_retries})"
-            } if logger
+            raise
           end
-        else
-          raise
         end
       end
     end
+  end
+end
 
+class Redis
+  class Client
     def call_with_reconnect_with_readonly(command, &block)
-      reconnect_with_readonly do
+      ReconnectWithReadonly.reconnect_with_readonly(self) do
         call_without_reconnect_with_readonly(command, &block)
       end
     end
 
     def call_loop_with_reconnect_with_readonly(command, &block)
-      reconnect_with_readonly do
+      ReconnectWithReadonly.reconnect_with_readonly(self) do
         call_loop_without_reconnect_with_readonly(command, &block)
       end
     end
 
     def call_pipeline_with_reconnect_with_readonly(command, &block)
-      reconnect_with_readonly do
+      ReconnectWithReadonly.reconnect_with_readonly(self) do
         call_pipeline_without_reconnect_with_readonly(command, &block)
       end
     end

data/lib/redis/reconnect_with_readonly/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-reconnect_with_readonly
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis