ruby_rolling_rate_limiter 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a4d27689f6f0095e817f2ddc39e345e7a0fdb09
-  data.tar.gz: 974182baa28ce3742660d2cc5996c40fbe19c749
+  metadata.gz: 707ecff1e33f4f609cc8399cdebab57ad206daca
+  data.tar.gz: 89273199718232705e954c41decdaa1923e10a98
 SHA512:
-  metadata.gz: 81fb38c9de11936c994ab72b05c41b9b6679250327b9e9e17499af7b06c4f3d78d5fb69dd54894139f510e73cada103a3374b0eb1800471b3e0d214f0fe3d7ca
-  data.tar.gz: 1cb014c36c572ce9022021c37adddb1d9500f85c0f0f76bf0e806ec07ca1a2e1bb7501a99859672ad975430b70336c100f417853877dc484e6b90d7f53290eb3
+  metadata.gz: 41bd11d653038fb3008c62e15289a031b3390ea797d8f38bfa1c1a602420ae5ca7c38459bc117e600b35eb2db9bc20b328ff71f82c4c91ae7d00b5bd59491a58
+  data.tar.gz: f683ecb68d5c63da9aa0eae3b3d1fd648f89d4ea7517f82ab39edf3cd0eb6c15ab3eacd56ecfbe50e9614ff6bce6274c3189e071b0927499f6ff3abe17a5ce6d

data/lib/ruby_rolling_rate_limiter.rb

@@ -1,7 +1,7 @@
 require "ruby_rolling_rate_limiter/version"
 require "ruby_rolling_rate_limiter/errors"
 require "redis"
-require 'redis-lock'
+require 'redlock'
 require "date"
 
 class RubyRollingRateLimiter
@@ -14,12 +14,13 @@ class RubyRollingRateLimiter
     @max_calls_per_interval = max_calls_per_interval
     @min_distance_between_calls_in_seconds = min_distance_between_calls_in_seconds
     @redis_connection = redis_connection
-    
     #Check to ensure args are good.
     validate_arguments
 
     # Check Redis is there
     check_redis_is_available
+    # Setup the Lock Manager
+    @lock_manager ||= Redlock::Client.new([redis_connection])
 
   end
 
@@ -42,24 +43,40 @@ class RubyRollingRateLimiter
     
     clear_before = now - interval
     # Begin multi redis
-    @redis_connection.lock("#{key}-lock") do |lock|
-      @redis_connection.multi
-      @redis_connection.zremrangebyscore(key, 0, clear_before.to_s)
-      @redis_connection.zrange(key, 0, -1)
-      cur = @redis_connection.exec
+    max_retry_counter = 0
+    begin
+      if max_retry_counter <= 100
+        @lock_manager.lock("#{key}-lock", 10000) do |locked|
+          if locked
+            @redis_connection.multi
+            @redis_connection.zremrangebyscore(key, 0, clear_before.to_s)
+            @redis_connection.zrange(key, 0, -1)
+            cur = @redis_connection.exec
 
-      if (cur[1].count <= @max_calls_per_interval) && ((cur[1].count+call_size) <= @max_calls_per_interval) && ((@min_distance_between_calls_in_seconds * 1000 * 1000) && (now - cur[1].last.to_i) > (@min_distance_between_calls_in_seconds * 1000 * 1000))
-        @redis_connection.multi
-        @redis_connection.zrange(key, 0, -1)
-        call_size.times do 
-          @redis_connection.zadd(key, now.to_s, now.to_s)
+            if (cur[1].count <= @max_calls_per_interval) && ((cur[1].count+call_size) <= @max_calls_per_interval) && ((@min_distance_between_calls_in_seconds * 1000 * 1000) && (now - cur[1].last.to_i) > (@min_distance_between_calls_in_seconds * 1000 * 1000))
+              @redis_connection.multi
+              @redis_connection.zrange(key, 0, -1)
+              call_size.times do 
+                @redis_connection.zadd(key, now.to_s, now.to_s)
+              end
+              @redis_connection.expire(key, @interval_in_seconds)
+              results = @redis_connection.exec
+            else
+              results = [cur[1]]
+            end
+          else
+            raise Errors::LockWaiting, "Could not aquire lock"
+          end
         end
-        @redis_connection.expire(key, @interval_in_seconds)
-        results = @redis_connection.exec
       else
-        results = [cur[1]]
+        raise Errors::MaxRetryReachedOnLockAcquire, "Unable to acquire lock for rate limit after 100 attempts"
       end
+    rescue Errors::LockWaiting
+      sleep 0.2
+      max_retry_counter +=1 
+      retry
     end
+
     if results
       call_set = results[0]
       too_many_in_interval = call_set.count >= @max_calls_per_interval

data/lib/ruby_rolling_rate_limiter/errors.rb

@@ -2,5 +2,7 @@ class RubyRollingRateLimiter
   module Errors
     class RedisNotFound < StandardError; end
     class ArgumentInvalid < StandardError; end
+    class LockWaiting < StandardError; end
+    class MaxRetryReachedOnLockAcquire < StandardError; end
   end
 end

data/lib/ruby_rolling_rate_limiter/version.rb

@@ -1,3 +1,3 @@
 class RubyRollingRateLimiter
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/ruby_rolling_rate_limiter.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bump"
 
   spec.add_runtime_dependency "redis", "~> 3.2"
-  spec.add_runtime_dependency "mlanett-redis-lock"
+  spec.add_runtime_dependency "redlock", "~> 0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rolling_rate_limiter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Karl Kloppenborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: mlanett-redis-lock
+  name: redlock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
 description: Often Redis is used for rate limiting purposes. Usually the rate limit
   packages available count how many times something happens on a certain second or
   a certain minute. When the clock ticks to the next minute, rate limit counter is