sidekiq-throttled-worker 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91197aecff6a9c46cb3c1435c85bdf1b74e5be216bbd9a89396fbdb6f00beb8b
-  data.tar.gz: c04884068ab7d1401460dead6edf0c029760dbe89a77d0490ecbbed7164609de
+  metadata.gz: 6b27bf285ed86d94c8e18e4f72ef48429b137c2ab0f11f63d108801b62d0a45c
+  data.tar.gz: 2cb0c549dd6c1e508fbdacf703267eef14aa75f5d5230d4c497dedd1ea3c5b42
 SHA512:
-  metadata.gz: 3a7ee4c386dbdae03b4a41aa2a26d70e8825286708e207486d83f9514c91018c8f2ed7fd00ce9cc698c91d0cf4d682a76e3f3296199047c8b045b9bd5d94f3ba
-  data.tar.gz: 7cfa3edc88f5ef7dcfd9932894fbd07b3a541366e4c0b53ca5613035eb5c17c8f2e48ac0cdb76df5a2aa9bd4fd3e85c60ff58057835fc3b14b2d068d7a89f6f4
+  metadata.gz: e6b2e56a6e37ceed5fa53024ea56d3a94df020e7f309b6b725a60694077a302185663cbab40e1f61530c9b8f7663300a0d4f79c038eddae4e04e10dc44d518cf
+  data.tar.gz: 1a68946ceffc3d09acf8b539b4bd543d1173f32a3d1d13fd7ec8d4a4ead3f11ffcf3db6a71b4926c3b9a9918a91562d8756d9c32dfccd50e7fce9b0f320f5e44

data/README.md

@@ -2,7 +2,7 @@
 
 Sidekiq concurrency limit per worker in whole cluster,  inspired by [sidekiq-throttled](https://github.com/sensortower/sidekiq-throttled). This gem only support concurrency, and try to avoid use lua in redis to reduce redis CPU usage.
 
-This gem was designed to limit concurrency for some sensitive resources, e.g., databases and http requests, without concurrency limit, sidekiq may crush this services. When some worker exceed concurrency limit, this gem may try to slow down sidekiq process. Concurrency limit should only be use to in extreme case, you should not use this gem to limit business logic
+This gem was designed to limit concurrency for some sensitive resources, e.g., databases and http requests, without concurrency limit, sidekiq may crush this services. When some worker exceed concurrency limit, this gem may try to slow down sidekiq process. 
 
 ## Installation
 

data/lib/sidekiq/throttled_worker.rb

@@ -16,6 +16,18 @@ module Sidekiq
           end
         end
       end
+
+      def redis=(hash)
+        @redis = if hash.is_a?(ConnectionPool)
+                   hash
+                 else
+                   Sidekiq::RedisConnection.create(hash)
+                 end
+      end
+
+      def redis
+        @redis ||= Sidekiq::RedisConnection.create
+      end
     end
   end
 end

data/lib/sidekiq/throttled_worker/concurrency.rb

@@ -6,10 +6,8 @@ module Sidekiq
           # only allow one worker check limit
           concurrency = worker_class.get_sidekiq_options["concurrency"]
           ttl = (worker_class.get_sidekiq_options["concurrency_ttl"] || 900) # assume worker should finish run in 15 minutes, and worker may be block completely max for 15 minutes in extreme case
-          check_limit_key = "sidekiq:throttled_worker:check_limit:#{worker_class}"
           now = Time.now.to_f
-          Sidekiq.redis do |conn|
-            return true unless conn.set(check_limit_key, 1, nx: true, ex: 60)
+          Sidekiq::ThrottledWorker.redis.with do |conn|
             conn.zremrangebyscore(concurrency_key(worker_class), "-inf", "(#{now}")
             return true if conn.zcard(concurrency_key(worker_class)) >= concurrency && conn.zscore(concurrency_key(worker_class), jid).nil?
             conn.zadd(concurrency_key(worker_class), (now + ttl).to_i, jid)
@@ -17,14 +15,10 @@ module Sidekiq
 
             false
           end
-        ensure
-          Sidekiq.redis do |conn|
-            conn.del(check_limit_key)
-          end
         end
 
         def finalize!(worker_class, jid)
-          Sidekiq.redis do |conn|
+          Sidekiq::ThrottledWorker.redis.with do |conn|
             conn.zrem(concurrency_key(worker_class), jid)
           end
         end

data/lib/sidekiq/throttled_worker/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module ThrottledWorker
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled-worker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - xuxiangyang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq