sidekiq-throttled 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77157db5b942df1a256b541b48cf882c0fb5fb9d
-  data.tar.gz: ec125a7c26dbe885913a7c0b0ef4f104f9f6bfb5
+  metadata.gz: 89651103d182029649562546de86fa491ac2fd78
+  data.tar.gz: b5d7b35e556a536c6d721d1332d66605120f5918
 SHA512:
-  metadata.gz: d162a63285e5959673f6d497bc5f5d54726279c879f8835a46ff79bd249b71c36516fc119dc93391a772ccb046d4ce6b018cc60db813cd9c33daf56eb40006fd
-  data.tar.gz: d063e884b5d7bf613b64b53c14c410c2b64e995102a012363152ee907307d501f4af73fe5926828b3eaa3e3f17358cc78d46575cf343b662addfd6ea25d1ad6e
+  metadata.gz: a3a1c17f1b72f7e9afc361265519bf067b6460474b9396d19369c06c4d6a509e973500d5b9016b97ad948f753ab24ce18ff573f1d97d11f2649ae4c1471a0a72
+  data.tar.gz: 27e73f96f33a6c3acaaa0eb7b8ae25f6c5672cb8d57763df7e9a0cab32bd679184eaad46623b23f9e6de158a6ec0d9ace231e8f7b377d4e6dee0eed6ca2b29af

data/.travis.yml

@@ -19,8 +19,10 @@ matrix:
     - rvm: rbx-2
   fast_finish: true
 gemfile:
-  - gemfiles/sidekiq_3.gemfile
-  - gemfiles/sidekiq_4.gemfile
+  - gemfiles/sidekiq_3.x.gemfile
+  - gemfiles/sidekiq_4.0.gemfile
+  - gemfiles/sidekiq_4.1.gemfile
+  - gemfiles/sidekiq_latest.gemfile
 before_install:
   - gem install bundler -v 1.10.6
 services:

data/Appraisals

@@ -1,8 +1,16 @@
-appraise "sidekiq-3" do
+appraise "sidekiq-3.x" do
   gem "celluloid"
   gem "sidekiq", "~> 3.0"
 end
 
-appraise "sidekiq-4" do
-  gem "sidekiq", "~> 4.0"
+appraise "sidekiq-4.0" do
+  gem "sidekiq", "~> 4.0.0"
+end
+
+appraise "sidekiq-4.1" do
+  gem "sidekiq", "~> 4.1.0"
+end
+
+appraise "sidekiq-latest" do
+  gem "sidekiq"
 end

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.3.2 (2016-05-16)
+
+* [#13](https://github.com/sensortower/sidekiq-throttled/issues/13)
+  Fix throttled BasicFetch with strictly ordered queues on sidekiq 4.
+  ([@palanglung], [@ixti])
+
+
 ## 0.3.1 (2016-05-15)
 
 * Precalculate LUA script digests to reduce bandwidth upon nodes reload
@@ -26,3 +33,4 @@
 
 [@ixti]: https://github.com/ixti
 [@fhwang]: https://github.com/fhwang
+[@palanglung]: https://github.com/palanglung

data/Gemfile

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "appraisal"
+gem "rake"
 gem "rspec"
 gem "rubocop"
 

data/gemfiles/{sidekiq_3.gemfile → sidekiq_3.x.gemfile}

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
+gem "rake"
 gem "rspec"
 gem "rubocop"
 gem "celluloid"

data/gemfiles/sidekiq_4.0.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "sidekiq", "~> 4.0.0"
+
+group :test do
+  gem "coveralls"
+  gem "rack-test"
+  gem "simplecov", ">= 0.9"
+  gem "sinatra", "~> 1.4", ">= 1.4.6"
+  gem "timecop"
+end
+
+gemspec :path => "../"

data/gemfiles/sidekiq_4.1.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "sidekiq", "~> 4.1.0"
+
+group :test do
+  gem "coveralls"
+  gem "rack-test"
+  gem "simplecov", ">= 0.9"
+  gem "sinatra", "~> 1.4", ">= 1.4.6"
+  gem "timecop"
+end
+
+gemspec :path => "../"

data/gemfiles/{sidekiq_4.gemfile → sidekiq_latest.gemfile}

@@ -3,9 +3,10 @@
 source "https://rubygems.org"
 
 gem "appraisal"
+gem "rake"
 gem "rspec"
 gem "rubocop"
-gem "sidekiq", "~> 4.0"
+gem "sidekiq"
 
 group :test do
   gem "coveralls"

data/lib/sidekiq/throttled/basic_fetch.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
-# stdlib
-require "thread"
 
-# 3rd party
 require "celluloid" if Sidekiq::VERSION < "4.0.0"
 require "sidekiq"
 require "sidekiq/fetch"
@@ -17,12 +14,10 @@ module Sidekiq
         alias job message if Sidekiq::VERSION < "4.0.0"
       end
 
-      # Class constructor
-      def initialize(*args)
-        @mutex      = Mutex.new
-        @suspended  = []
-
-        super(*args)
+      def initialize(options)
+        @strictly_ordered_queues = (options[:strict] ? true : false)
+        @queues = options[:queues].map { |q| "queue:#{q}" }
+        @queues.uniq! if @strictly_ordered_queues
       end
 
       # @return [Sidekiq::BasicFetch::UnitOfWork, nil]
@@ -35,7 +30,6 @@ module Sidekiq
 
         queue = "queue:#{work.queue_name}"
 
-        @mutex.synchronize { @suspended << queue }
         Sidekiq.redis { |conn| conn.lpush(queue, work.job) }
 
         nil
@@ -46,23 +40,7 @@ module Sidekiq
       # Tries to pop pair of `queue` and job `message` out of sidekiq queue.
       # @return [Array<String, String>, nil]
       def brpop
-        queues = if @strictly_ordered_queues
-                   @unique_queues.dup
-                 else
-                   @queues.shuffle.uniq
-                 end
-
-        @mutex.synchronize do
-          next if @suspended.empty?
-          queues -= @suspended
-          @suspended.clear
-        end
-
-        if queues.empty?
-          sleep TIMEOUT
-          return
-        end
-
+        queues = (@strictly_ordered_queues ? @queues : @queues.shuffle.uniq)
         Sidekiq.redis { |conn| conn.brpop(*queues, TIMEOUT) }
       end
     end

data/lib/sidekiq/throttled/version.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.2".freeze
   end
 end

data/sidekiq-throttled.gemspec

@@ -28,5 +28,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "sidekiq"
 
   spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Alexey V Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 description: Concurrency and threshold throttling for Sidekiq.
 email:
 - ixti@member.fsf.org
@@ -71,8 +57,10 @@ files:
 - README.md
 - Rakefile
 - bin/setup
-- gemfiles/sidekiq_3.gemfile
-- gemfiles/sidekiq_4.gemfile
+- gemfiles/sidekiq_3.x.gemfile
+- gemfiles/sidekiq_4.0.gemfile
+- gemfiles/sidekiq_4.1.gemfile
+- gemfiles/sidekiq_latest.gemfile
 - lib/sidekiq/throttled.rb
 - lib/sidekiq/throttled/basic_fetch.rb
 - lib/sidekiq/throttled/errors.rb