sidekiq-limit_fetch 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4db872c28ebde76d915d79b0a0bdbdbcf9859b38
-  data.tar.gz: 9c6104f1869c2979a9e908f01ca6035d3319e134
+  metadata.gz: 6b6b646adb74d487fd895406ea53cda04b0ab98e
+  data.tar.gz: b28348a416bc854f47482b2cde8bd34cd2446e17
 SHA512:
-  metadata.gz: 28706d72d599cc68bb431edafdbfb886a4438b92e165257ae5fe862aee16899d530a5c96fa42c75a2f7f8155105e6d0219bdbfb91493d1bfd7c49eff26dcf605
-  data.tar.gz: 4dc6225e29e2aa26a64867f9dda5eee538000e443e713da38bd3b4d124aa5bfafbf563ec72214e6df120e90af30af5a7d5cdac014426196b398adfb90e637e2f
+  metadata.gz: 27c6e9b79001dce26c0aaac71ffbe5d70787018a1c51bb0538ba3707f2a4db51c9b65f94fabd67cb399a934ad38b876ba567d5629441462c66a9615eddf13c25
+  data.tar.gz: be6b48c15f8d66d561d2d07fde2903e4f4acb87c72b7f7b50a383f2cebd42e0b342f0bf980e18e1917e1997fedbb424679c9f2cdb547ebd592f925fbeab5adab

data/README.md

@@ -18,6 +18,12 @@ Add this line to your application's Gemfile:
 
 redis 2.6 or newer
 
+```
+heroku uses redis 2.4 by default
+to update version you need to contact their support:
+https://devcenter.heroku.com/articles/redistogo#redis-26
+```
+
 ## Usage
 
 ### Limits

data/lib/sidekiq/extensions/queue.rb

@@ -1,6 +1,7 @@
 module Sidekiq
   class Queue
     extend LimitFetch::Singleton, Forwardable
+    attr_reader :rname
 
     def_delegators :lock,
       :limit,         :limit=,
@@ -10,7 +11,8 @@ module Sidekiq
       :paused?,       :blocking?,
       :unblocked,     :block_except,
       :probed,        :busy,
-      :increase_busy, :decrease_busy
+      :increase_busy, :decrease_busy,
+      :local_busy?
 
     def lock
       @lock ||= LimitFetch::Global::Semaphore.new name

data/lib/sidekiq/limit_fetch.rb

@@ -15,8 +15,8 @@ class Sidekiq::LimitFetch
   include Redis
   Sidekiq.options[:fetch] = self
 
-  def self.bulk_requeue(jobs)
-    Sidekiq::BasicFetch.bulk_requeue jobs
+  def self.bulk_requeue(*args)
+    Sidekiq::BasicFetch.bulk_requeue *args
   end
 
   def initialize(options)
@@ -39,6 +39,16 @@ class Sidekiq::LimitFetch
 
   def redis_brpop(*args)
     return if args.size < 2
-    nonblocking_redis {|it| it.brpop *args }
+    query = -> redis { redis.brpop *args }
+
+    if busy_local_queues.any? {|queue| not args.include? queue.rname }
+      nonblocking_redis(&query)
+    else
+      redis(&query)
+    end
+  end
+
+  def busy_local_queues
+    Sidekiq::Queue.instances.select(&:local_busy?)
   end
 end

data/lib/sidekiq/limit_fetch/global/semaphore.rb

@@ -4,8 +4,12 @@ module Sidekiq::LimitFetch::Global
 
     PREFIX = 'limit_fetch'
 
+    attr_reader :local_busy
+
     def initialize(name)
       @name = name
+      @lock = Mutex.new
+      @local_busy = 0
     end
 
     def limit
@@ -30,10 +34,12 @@ module Sidekiq::LimitFetch::Global
     end
 
     def increase_busy
+      increase_local_busy
       redis {|it| it.rpush "#{PREFIX}:busy:#@name", Selector.uuid }
     end
 
     def decrease_busy
+      decrease_local_busy
       redis {|it| it.lrem "#{PREFIX}:busy:#@name", 1, Selector.uuid }
     end
 
@@ -69,5 +75,17 @@ module Sidekiq::LimitFetch::Global
     def blocking?
       redis {|it| it.get "#{PREFIX}:block:#@name" }
     end
+
+    def increase_local_busy
+      @lock.synchronize { @local_busy += 1 }
+    end
+
+    def decrease_local_busy
+      @lock.synchronize { @local_busy -= 1 }
+    end
+
+    def local_busy?
+      @local_busy > 0
+    end
   end
 end

data/lib/sidekiq/limit_fetch/singleton.rb

@@ -8,4 +8,8 @@ module Sidekiq::LimitFetch::Singleton
   end
 
   alias [] new
+
+  def instances
+    @instances.values
+  end
 end

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '2.0.1'
+  gem.version       = '2.0.2'
   gem.authors       = 'brainopia'
   gem.email         = 'brainopia@evilmartians.com'
   gem.summary       = 'Sidekiq strategy to support queue limits'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - brainopia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -72,7 +72,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- benchmarks/compare.rb
+- bench/compare.rb
 - lib/sidekiq-limit_fetch.rb
 - lib/sidekiq/extensions/queue.rb
 - lib/sidekiq/limit_fetch.rb