gcra 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9b29ec6abd01bba124433e5e331f1935e9ed5edc
-  data.tar.gz: e44c984d0d02dd54f92959e9782d4b5d755f71b4
+SHA256:
+  metadata.gz: b02bda1b59d67535c5f7e098f0553e7d79dab0baed8266668e4533eaf083fdd8
+  data.tar.gz: 12f92e851d067cc367180e9c4528f7564ffc487ddd62273fecd6450fbb8de894
 SHA512:
-  metadata.gz: 3090609da18cda2a4807eff2e2fb7faf9a354dc996c159af0e42e1412448792196ba57151204cb96085e9a05417332e387c68cddb9a68fd0527a6123d99dd5de
-  data.tar.gz: f18cd4c996c23bef845942364f387101d4ed452e24fe289e39ff9d5333a3059d6cedb6218eeba7050ca1ddc41f7a0db3af46d8adc0cce8bd498be8d0b984d5bd
+  metadata.gz: 993dfc9876b0b5f92e7456a20f1e9da2875505f41457540d7e8a41ea59f2e0080880ad96bc6e7b1751dbea67c60b4b416a88099350a5435c60b467f90f42e1fa
+  data.tar.gz: cdc1e40167c88d8a3749a8176c2683520973e844063ed3035e4b9be8533c1c07af7d8119ed8eec6a24e3c918850f914a55394784e3db06d8d9c0e91e5bb3eed0

data/lib/gcra/redis_store.rb

@@ -16,11 +16,15 @@ module GCRA
     # Digest::SHA1.hexdigest(CAS_SCRIPT)
     CAS_SHA = "89118e702230c0d65969c5fc557a6e942a2f4d31".freeze
     CAS_SCRIPT_MISSING_KEY_RESPONSE = 'key does not exist'.freeze
-    SCRIPT_NOT_IN_CACHE_RESPONSE = 'NOSCRIPT No matching script. Please use EVAL.'
+    SCRIPT_NOT_IN_CACHE_RESPONSE = 'NOSCRIPT No matching script. Please use EVAL.'.freeze
 
-    def initialize(redis, key_prefix)
+    CONNECTED_TO_READONLY = "READONLY You can't write against a read only slave.".freeze
+
+    def initialize(redis, key_prefix, options = {})
       @redis = redis
       @key_prefix = key_prefix
+
+      @reconnect_on_readonly = options[:reconnect_on_readonly] || false
     end
 
     # Returns the value of the key or nil, if it isn't in the store.
@@ -43,8 +47,18 @@ module GCRA
     # Also set the key's expiration (ttl, in seconds).
     def set_if_not_exists_with_ttl(key, value, ttl_nano)
       full_key = @key_prefix + key
-      ttl_milli = calculate_ttl_milli(ttl_nano)
-      @redis.set(full_key, value, nx: true, px: ttl_milli)
+      retried = false
+      begin
+        ttl_milli = calculate_ttl_milli(ttl_nano)
+        @redis.set(full_key, value, nx: true, px: ttl_milli)
+      rescue Redis::CommandError => e
+        if e.message == CONNECTED_TO_READONLY && @reconnect_on_readonly && !retried
+          @redis.client.reconnect
+          retried = true
+          retry
+        end
+        raise
+      end
     end
 
     # Atomically compare the value at key to the old value. If it matches, set it to the new value
@@ -63,6 +77,10 @@ module GCRA
           @redis.script('load', CAS_SCRIPT)
           retried = true
           retry
+        elsif e.message == CONNECTED_TO_READONLY && @reconnect_on_readonly && !retried
+          @redis.client.reconnect
+          retried = true
+          retry
         end
         raise
       end

data/lib/gcra/version.rb

@@ -1,3 +1,3 @@
 module GCRA
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gcra
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Frister
 - Tobias Schoknecht
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-02 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,7 +53,7 @@ homepage: https://github.com/Barzahlen/gcra-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,9 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Ruby implementation of a generic cell rate algorithm (GCRA), ported from
   the Go implementation throttled.