sidekiq-limit_fetch 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c949366fce8ef0a1f51ccef3973bded9c94c639a
-  data.tar.gz: c85ead7127f04b16efa8e50459bb0943b876762c
+  metadata.gz: 90670344f1d8eaa97d215118db466740393123aa
+  data.tar.gz: 3364780aa3ff90b22d4156d7a2eb6b315ca072b9
 SHA512:
-  metadata.gz: 8204753f854ed3af8a6e05884fb739079059c0c9723c25daf8b7206b832ebfc92afd3197f42a19ba92da5bf1c3327e01955277ff12a993b0d1f5346bd100a410
-  data.tar.gz: 26e0d3c81fc68942382d8d55f15e3fa018603afd788610d4bf1c294bf957f3c7dd70975bdbf5663b3aa90ab4da2381938eebd90bb77b12aec72c8682a323de3f
+  metadata.gz: f27825c415fa9995330e61bf78877fe20bbb1e1af4782d9e3072803092a55e170569d80cdd9f8bd0966c81c562fda120f5b0fd878b06e78532731e5490a20bfd
+  data.tar.gz: 1d326108a6cc523131e44337c3f7e43116f7775d6f7a538b5d4a6ce63f276010a9ee379429bec18be725931ecd35d20a5f2b2eeb5bb3df5eeb86e5df406bbe95

data/lib/sidekiq/limit_fetch/queues.rb

@@ -4,14 +4,18 @@ module Sidekiq::LimitFetch::Queues
   THREAD_KEY = :acquired_queues
 
   def start(options)
-    @queues    = options[:queues]
-    @dynamic   = options[:dynamic]
+    @queues         = options[:queues]
+    @dynamic        = options[:dynamic]
+
+    @limits         = options[:limits] || {}
+    @process_limits = options[:process_limits] || {}
+    @blocks         = options[:blocking] || []
 
     options[:strict] ? strict_order! : weighted_order!
 
-    set :process_limit, options[:process_limits]
-    set :limit, options[:limits]
-    set_blocks options[:blocking]
+    apply_process_limit_to_queues
+    apply_limit_to_queues
+    apply_blocks_to_queues
   end
 
   def acquire
@@ -35,7 +39,12 @@ module Sidekiq::LimitFetch::Queues
 
   def add(queues)
     queues.each do |queue|
-      @queues.push queue unless @queues.include? queue
+      unless @queues.include? queue
+        apply_process_limit_to_queue(queue)
+        apply_limit_to_queue(queue)
+
+        @queues.push queue
+      end
     end
   end
 
@@ -60,22 +69,37 @@ module Sidekiq::LimitFetch::Queues
 
   private
 
-  def selector
-    Sidekiq::LimitFetch::Global::Selector
+  def apply_process_limit_to_queues
+    @queues.uniq.each do |queue_name|
+      apply_process_limit_to_queue(queue_name)
+    end
+  end
+
+  def apply_process_limit_to_queue(queue_name)
+    queue = Sidekiq::Queue[queue_name]
+    queue.process_limit = @process_limits[queue_name.to_s] || @process_limits[queue_name.to_sym]
   end
 
-  def set(limit_type, limits)
-    limits ||= {}
-    each_queue do |queue|
-      limit = limits[queue.name.to_s] || limits[queue.name.to_sym]
-      queue.send "#{limit_type}=", limit unless queue.limit_changed?
+  def apply_limit_to_queues
+    @queues.uniq.each do |queue_name|
+      apply_limit_to_queue(queue_name)
     end
   end
 
-  def set_blocks(blocks)
-    each_queue(&:unblock)
+  def apply_limit_to_queue(queue_name)
+    queue = Sidekiq::Queue[queue_name]
 
-    blocks.to_a.each do |it|
+    unless queue.limit_changed?
+      queue.limit = @limits[queue_name.to_s] || @limits[queue_name.to_sym]
+    end
+  end
+
+  def apply_blocks_to_queues
+    @queues.uniq.each do |queue_name|
+      Sidekiq::Queue[queue_name].unblock
+    end
+
+    @blocks.to_a.each do |it|
       if it.is_a? Array
         it.each {|name| Sidekiq::Queue[name].block_except it }
       else
@@ -84,6 +108,10 @@ module Sidekiq::LimitFetch::Queues
     end
   end
 
+  def selector
+    Sidekiq::LimitFetch::Global::Selector
+  end
+
   def save(queues)
     Thread.current[THREAD_KEY] = queues
   end
@@ -93,8 +121,4 @@ module Sidekiq::LimitFetch::Queues
   ensure
     Thread.current[THREAD_KEY] = nil
   end
-
-  def each_queue
-    @queues.uniq.each {|it| yield Sidekiq::Queue[it] }
-  end
 end

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '3.3.1'
+  gem.version       = '3.4.0'
   gem.license       = 'MIT'
   gem.authors       = 'brainopia'
   gem.email         = 'brainopia@evilmartians.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - brainopia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -17,13 +17,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -34,8 +34,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -44,6 +42,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -51,13 +51,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -65,13 +65,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 description: |2
       Sidekiq strategy to restrict number of workers
       which are able to run specified queues simultaneously.
@@ -121,7 +121,7 @@ homepage: https://github.com/brainopia/sidekiq-limit_fetch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,9 +136,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.4
+signing_key:
 specification_version: 4
 summary: Sidekiq strategy to support queue limits
 test_files: