sidekiq-limit_fetch 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35782b40e123ecb5150daf62de8e271d135b0b40
-  data.tar.gz: a690354bc035c32d6c976ad1f355aa67d7f82689
+  metadata.gz: 5c955908fd9f7ade4f4cd2f09f00489e6aa1416e
+  data.tar.gz: 4b5aee7b583fa41536883e2bd00f94a71e2310af
 SHA512:
-  metadata.gz: c615557f879fb2c49a286d005335199d80d96326a38786ae784bfc73f645687966b111c4cc5e11d238a1d0eb25ed65759cb45b259a5df3cf0a81af55b30b4b19
-  data.tar.gz: 1b1d747d357512c22a56729cc111e852c9317bb3d0078746d4b31d74118c53f16f52a2bb3e9e05a705203a2f3aa8e02ac82c7da2797b9313f48f26598d012f2a
+  metadata.gz: dc6a6b608540c3c206dcb36379185c76dd6e6ce017b22846dca3fb7c9d8194e73401b3d281c1e373aeb51cd4783a17af3a1581bb137e4fd144a6ad070f348186
+  data.tar.gz: ee479c98a4e448ad29c9edb3ae1f8fe536b1fc8fca61e2713d206ae614d2cd3786fa784c8b123086bf60afdc7cdda149c35a6bb4d075b2fd52f6678f68191971

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.3.0
   - 2.2.1
   - jruby-head
   - rbx-2

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'sidekiq', github: 'mperham/sidekiq', branch: 'internal_rewrite'
+gem 'sidekiq'

data/README.md

@@ -16,15 +16,11 @@ Add this line to your application's Gemfile:
 
 ### Requirements
 
-redis 2.6 or newer
-
 **Important note:** At this moment, `sidekiq-limit_fetch` is incompatible with
 - sidekiq pro's `reliable_fetch`
 - `sidekiq-rate-limiter`
 - any other plugin that rewrites fetch strategy of sidekiq.
 
-https://github.com/mperham/sidekiq/issues/1508 — a sidekiq admin busy page is unreliable, so if you need to check how many workers are running a queue use a `#busy` method described below.
-
 ## Usage
 
 ### Limits

data/lib/sidekiq/limit_fetch.rb

@@ -21,9 +21,9 @@ module Sidekiq::LimitFetch
   end
 
   def retrieve_work
-    queue, message = redis_brpop *Queues.acquire, Sidekiq::BasicFetch::TIMEOUT
-    Queues.release_except queue
-    UnitOfWork.new queue, message if message
+    queue, job = redis_brpop *Queues.acquire, Sidekiq::BasicFetch::TIMEOUT
+    Queues.release_except(queue)
+    UnitOfWork.new(queue, job) if job
   end
 
   def bulk_requeue(*args)

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

@@ -2,6 +2,8 @@ module Sidekiq::LimitFetch::Global
   module Selector
     extend self
 
+    MUTEX_FOR_UUID = Mutex.new
+
     def acquire(queues, namespace)
       redis_eval :acquire, [namespace, uuid, queues]
     end
@@ -15,9 +17,7 @@ module Sidekiq::LimitFetch::Global
       # then @uuid can be overwritten
       # - if we'll remove "@uuid ||=" from outside of mutex
       # then each read will lead to mutex
-      @uuid ||= Thread.exclusive do
-        @uuid || SecureRandom.uuid
-      end
+      @uuid ||= MUTEX_FOR_UUID.synchronize { @uuid || SecureRandom.uuid }
     end
 
     private

data/lib/sidekiq/limit_fetch/unit_of_work.rb

@@ -1,6 +1,6 @@
 module Sidekiq
   class LimitFetch::UnitOfWork < BasicFetch::UnitOfWork
-    def initialize(queue, message)
+    def initialize(queue, job)
       super
       Queue[queue_name].increase_busy
     end

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '3.0.1'
+  gem.version       = '3.1.0'
   gem.license       = 'MIT'
   gem.authors       = 'brainopia'
   gem.email         = 'brainopia@evilmartians.com'
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = 'lib'
 
   gem.add_dependency 'sidekiq', '>= 4'
+  gem.add_development_dependency 'redis-namespace', '~> 1.5', '>= 1.5.2'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
 end

data/spec/sidekiq/limit_fetch_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Sidekiq::LimitFetch do
   it 'should acquire lock on queue for execution' do
     work = subject.retrieve_work
     expect(work.queue_name).to eq 'queue1'
-    expect(work.message).to eq 'task1'
+    expect(work.job).to eq 'task1'
 
     expect(Sidekiq::Queue['queue1'].busy).to eq 1
     expect(Sidekiq::Queue['queue2'].busy).to eq 0
@@ -31,7 +31,7 @@ RSpec.describe Sidekiq::LimitFetch do
     expect(Sidekiq::Queue['queue2'].busy).to eq 0
 
     work = subject.retrieve_work
-    expect(work.message).to eq 'task1'
+    expect(work.job).to eq 'task1'
 
     expect(Sidekiq::Queue['queue1'].busy).to eq 1
     expect(Sidekiq::Queue['queue2'].busy).to eq 0
@@ -43,6 +43,6 @@ RSpec.describe Sidekiq::LimitFetch do
     expect(Sidekiq::Queue['queue2'].busy).to eq 0
 
     work = subject.retrieve_work
-    expect(work.message).to eq 'task2'
+    expect(work.job).to eq 'task2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - brainopia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -24,6 +24,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Sidekiq strategy to support queue limits