redis-reconnect_with_readonly 0.1.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15ff6c001cad1dccfdde9ba2c50f13b9993e432c
-  data.tar.gz: 8b631aa7157e62ff540abdb75c2f4972e617879b
+  metadata.gz: cbdb865f95527d8a9e8ab4fc749d30f7b9cf6947
+  data.tar.gz: b6a976fc9d8e32d30bf1c146b28d407564850659
 SHA512:
-  metadata.gz: 923f28e0401979e5a86a68a628a516cc3fd56f7347f0125635fcb6e7bde0a9b0fa2be07147211c90c7d3301582ad78ad59a89bd184a6b7ba61a6c28eba98c110
-  data.tar.gz: 39729e0ea98fbc89a64e1e56111a08823bf3e2c291899760fdbc0d8df22dd074e44e4b4ab851ee456f5fb2fa9dca30540492a549e0d5547e862b1b2b15ead996
+  metadata.gz: f9cb7e568d9578ea7ac101957433cd70b433f8d2779516790f7a7749e00133e752623d11fb6b6250636024181f5e9337d7b554b12f4108172f3e0d1f56d91f3d
+  data.tar.gz: 0c221329b3f884417b1e8b5123024bf374832947aba838120885898038bf713cb7877efbfb788647a1eea23fe4deb0b9825f1739b6f4e720e7daf8a81a1d04ad

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.9.0 (2016-08-25)
+
+Enhancements:
+
+* Add `initial_retry_wait`
+
+Changes:
+
+* Rename `max_retry_interval` to `max_retry_wait`
+* Change wait formula from `initial_retry_wait ^ number of retries` to `initial_retry_wait * number of retries`
+
 # 0.1.1 (2016-08-24)
 
 * Make configurable `reconnect_attempts` and `max_retry_interval`
@@ -5,4 +16,3 @@
 # 0.1.0 (2016-08-24)
 
 First version
-

data/README.md

@@ -29,12 +29,13 @@ require 'redis/reconnect_with_readonly'
 ## Configuration
 
 This gem tries reconnection `reconnect_attempts` times.
-It will wait `2 ^ num of retries` second interval on each retry.
-The waiting interval can be suppressed up to `max_retry_interval`.
+It will wait `initial_retry_wait * number of retries` second wait on each retry.
+The waiting wait can be suppressed up to `max_retry_wait`.
 
 ```
-Redis::ReconnectWithReadonly.reconnect_attempts = 1
-Redis::ReconnectWithReadonly.max_retry_interval = 3600
+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)
 ```
 
 ## Implementation
@@ -61,9 +62,12 @@ $ bin/console
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/redis-reconnect_with_readonly. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/sonots/redis-reconnect_with_readonly. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
+## ChangeLog
+
+[CHANGELOG.md](./CHANGELOG.md)

data/bin/try

@@ -5,7 +5,8 @@ require "redis/reconnect_with_readonly"
 require 'logger'
 
 Redis::ReconnectWithReadonly.reconnect_attempts = 5
-Redis::ReconnectWithReadonly.max_retry_interval = 3
+Redis::ReconnectWithReadonly.initial_retry_wait = 1
+Redis::ReconnectWithReadonly.max_retry_wait = 3
 
 logger = Logger.new(STDOUT)
 redis = Redis.new(host: 'localhost', port: '6380', logger: logger)

data/lib/redis/reconnect_with_readonly.rb

@@ -5,18 +5,17 @@ require 'redis/errors'
 
 class Redis
   class ReconnectWithReadonly
-    @reconnect_attempts = 1
-    @max_retry_interval = 3600 # sec
+    @reconnect_attempts  = 3
+    @initial_retry_wait = 0.5
+    @max_retry_wait  = nil
 
     class << self
-      attr_accessor :reconnect_attempts, :max_retry_interval
+      attr_accessor :reconnect_attempts, :initial_retry_wait, :max_retry_wait
     end
   end
 end
 
 class Redis
-  class ReadonlyConnectionError < ConnectionError; end
-
   class Client
     def reconnect_with_readonly(&block)
       retries = 0
@@ -25,12 +24,13 @@ class Redis
       rescue CommandError => e
         if e.message =~ /READONLY/
           if retries < (max_retries = ReconnectWithReadonly.reconnect_attempts)
-            interval = [2**retries, ReconnectWithReadonly.max_retry_interval].min
+            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: #{interval}sec)"
+              "(retries: #{retries}/#{max_retries}) (wait: #{wait}sec)"
             } if logger
-            sleep interval
+            sleep wait
             retries += 1
             retry
           else

data/lib/redis/reconnect_with_readonly/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class ReconnectWithReadonly
-    VERSION = "0.1.1"
+    VERSION = "0.9.0"
   end
 end

metadata

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