sidekiq-limit_fetch 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af4e92376eea915d5ecb40d3d7183859062bf21c
-  data.tar.gz: d596ab1071c952a68eb029a42c3cc4040be33f23
+  metadata.gz: 308521ae4ca41ec67f93b1e586c24d5b2704c6f2
+  data.tar.gz: 638d54dc481262e7bf13a128777cd22016106a3d
 SHA512:
-  metadata.gz: 4994be60172a5e21930553db313433ef721c2082fcde29dab9a3b38f9241a0c3da94f216b1e36ebac34c880988100c37394d4b420dac651824d63dbde5ec42a3
-  data.tar.gz: a46416a2481d50e3aa67ec45000ad66c4777f35a36e9d9d6ee1b57228eda0bc4599ec7da73594eda64095431c37da402b4384193b90577ef1ccd27bd3aa02231
+  metadata.gz: 6a584f739cc6c4c825a6c1da2e09aec8536ca866433605252220b503bc3fbabe75a35228053b4ba38656c7016b24aa466272c321cc0d1bd41eb04829c5e0f7f7
+  data.tar.gz: d62381535352afec36b7668792f0db79d069ec4b10ab0ede19dc7d6c69720a21612265338192ecd4f693e08a0bcc21d988b5e20bd47b025b38035a3a1fefbd0e

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
+  - 2.2.1
+  - jruby-head
+  - rbx-2
 services:
   - redis-server
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
+    - rvm: rbx-2

data/lib/sidekiq/extensions/queue.rb

@@ -4,10 +4,10 @@ module Sidekiq
     attr_reader :rname
 
     def_delegators :lock,
-      :limit,         :limit=,
+      :limit,         :limit=,         :limit_changed?,
       :process_limit, :process_limit=,
       :acquire,       :release,
-      :pause, :pause_for_ms, :unpause,
+      :pause,         :pause_for_ms,   :unpause,
       :block,         :unblock,
       :paused?,       :blocking?,
       :unblocked,     :block_except,

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

@@ -18,6 +18,8 @@ module Sidekiq::LimitFetch::Global
     end
 
     def limit=(value)
+      @limit_changed = true
+
       if value
         redis {|it| it.set "#{PREFIX}:limit:#@name", value }
       else
@@ -25,6 +27,10 @@ module Sidekiq::LimitFetch::Global
       end
     end
 
+    def limit_changed?
+      @limit_changed
+    end
+
     def process_limit
       value = redis {|it| it.get "#{PREFIX}:process_limit:#@name" }
       value.to_i if value

data/lib/sidekiq/limit_fetch/queues.rb

@@ -36,6 +36,15 @@ class Sidekiq::LimitFetch
       end
     end
 
+    def strict_order!
+      @queues.uniq!
+      def ordered_queues; @queues end
+    end
+
+    def weighted_order!
+      def ordered_queues; @queues.shuffle.uniq end
+    end
+
     private
 
     def selector
@@ -46,7 +55,7 @@ class Sidekiq::LimitFetch
       limits ||= {}
       each_queue do |queue|
         limit = limits[queue.name.to_s] || limits[queue.name.to_sym]
-        queue.send "#{limit_type}=", limit
+        queue.send "#{limit_type}=", limit unless queue.limit_changed?
       end
     end
 
@@ -62,15 +71,6 @@ class Sidekiq::LimitFetch
       end
     end
 
-    def strict_order!
-      @queues.uniq!
-      def ordered_queues; @queues end
-    end
-
-    def weighted_order!
-      def ordered_queues; @queues.shuffle.uniq end
-    end
-
     def save(queues)
       Thread.current[THREAD_KEY] = queues
     end

data/lib/sidekiq/limit_fetch/redis.rb

@@ -1,19 +1,24 @@
 module Sidekiq::LimitFetch::Redis
   extend self
 
-  # prevent blocking of fetcher
-  # more bullet-proof and faster (O_O)
-  # than using Celluloid::IO
-  #
-  # https://github.com/brainopia/sidekiq-limit_fetch/issues/41
-  # explanation of why Future#value is beneficial here
   def nonblocking_redis
     redis do |redis|
-      begin
-        Celluloid::Future.new { yield redis }.value
+      # Celluloid 0.16 broke this method
+      if Celluloid::VERSION.to_f >= 0.16
+        yield redis
+      else
+      # prevent blocking of fetcher
+      # more bullet-proof and faster (O_O)
+      # than using Celluloid::IO
+      #
+      # https://github.com/brainopia/sidekiq-limit_fetch/issues/41
+      # explanation of why Future#value is beneficial here
+        begin
+          Celluloid::Future.new { yield redis }.value
+        rescue Celluloid::Task::TerminatedError
+        end
       end
     end
-  rescue Celluloid::Task::TerminatedError
   end
 
   def redis

data/lib/sidekiq/limit_fetch/singleton.rb

@@ -12,4 +12,8 @@ module Sidekiq::LimitFetch::Singleton
   def instances
     @instances.values
   end
+
+  def reset_instances!
+    @instances = {}
+  end
 end

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '2.4.0'
+  gem.version       = '2.4.1'
   gem.license       = 'MIT'
   gem.authors       = 'brainopia'
   gem.email         = 'brainopia@evilmartians.com'
@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w(lib)
 
   gem.add_dependency 'sidekiq', '>= 2.6.5', '< 4.0'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '< 3.0'
   gem.add_development_dependency 'rake'
 end

data/spec/sidekiq/extensions/queue_spec.rb

@@ -84,6 +84,13 @@ describe Sidekiq::Queue do
         queue.unblock
         queue.should_not be_blocking
       end
+
+      it 'should be marked as changed' do
+        queue = Sidekiq::Queue["uniq_#{name}"]
+        queue.should_not be_limit_changed
+        queue.limit = 3
+        queue.should be_limit_changed
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ Sidekiq.redis = { namespace: ENV['namespace'] }
 
 RSpec.configure do |config|
   config.before :each do
+    Sidekiq::Queue.reset_instances!
     Sidekiq.redis do |it|
       clean_redis = ->(queue) do
         it.pipelined do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - brainopia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -34,16 +34,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement