sidekiq-limit_fetch 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45106fd76c4d8e0bb1621e904f0826b08450ac42
-  data.tar.gz: 776c116e27e48b3262a7a201f9fd7e3843c800e0
+  metadata.gz: c530f12f2c18dba1c729e6271112081154a78b7f
+  data.tar.gz: 0d9a6695cad3ec9965a2629ef8e8b83b171bcb8d
 SHA512:
-  metadata.gz: 19b51939f0560f367ee1ccb167c0b251f3dc6af1abd0cf4cac9f76eb760c098c8a479e99ddc1cdb3d068f4c3267ccdad49174505cb2e49fb82b59ede7a0eba36
-  data.tar.gz: f975a401b537405c83c597490b42cf37d46f9ee5c433744accb5dd28ea6b27d5c377f85fe6518117118eaf93adfe9f318713faae16c56117ada55be3f5cfede2
+  metadata.gz: 30851e2e580ae34f6e2a67d7fe6a44397e723a9811377d0afb4defc2a04ea821a5b498b16df70666558f04070923e1549f0c4e4a4633110a0f2d3b13b67c9dee
+  data.tar.gz: f445df4cec59bf1773f9947eb3fd76b5e19eeacba7e73a6136bcd99828bd94dd2fe3c2ac48a60f2e3d6deb371add6251b55273e5a49883790e1e840581a2bb5e

data/README.md

@@ -58,23 +58,6 @@ will be preserved.
   Sidekiq::Queue['name'].unpause # allows workers to use the queue
 ```
 
-### Multiple processes
-
-Limits are applied per process. In case you have several worker
-processes and want to have global locks between them, you'll need to
-enable global mode by setting global option, eg:
-
-```yaml
-  :global: true
-```
-
-or
-
-```ruby
-  Sidekiq.options[:global] = true
-```
-
-
 ### Blocking queue mode
 
 If you use strict queue ordering (it will be used if you don't specify queue weights)

data/lib/sidekiq/extensions/queue.rb

@@ -16,7 +16,7 @@ module Sidekiq
     end
 
     def mode
-      Sidekiq.options[:global] ? LimitFetch::Global : LimitFetch::Local
+      Sidekiq.options[:local] ? LimitFetch::Local : LimitFetch::Global
     end
   end
 end

data/lib/sidekiq/limit_fetch/queues.rb

@@ -7,7 +7,7 @@ class Sidekiq::LimitFetch
       @queues = options[:queues]
       options[:strict] ? strict_order! : weighted_order!
 
-      set_selector options[:global]
+      set_selector options[:local]
       set_limits options[:limits]
       set_blocks options[:blocking]
     end
@@ -26,8 +26,8 @@ class Sidekiq::LimitFetch
 
     private
 
-    def set_selector(global)
-      @selector = global ? Global::Selector : Local::Selector
+    def set_selector(local)
+      @selector = local ? Local::Selector : Global::Selector
     end
 
     def set_limits(limits)

data/lib/sidekiq/limit_fetch.rb

@@ -19,7 +19,7 @@ class Sidekiq::LimitFetch
   end
 
   def initialize(options)
-    Global::Monitor.start! if options[:global]
+    Global::Monitor.start! unless options[:local]
     @queues = Queues.new options
   end
 

data/sidekiq-limit_fetch.gemspec

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

data/spec/sidekiq/extensions/queue_spec.rb

@@ -88,12 +88,12 @@ describe Sidekiq::Queue do
       end
 
       context 'global' do
-        before(:all) { Sidekiq.options[:global] = true }
+        before(:all) { Sidekiq.options[:local] = false }
         it_behaves_like :lock
       end
 
       context 'local' do
-        before(:all) { Sidekiq.options[:global] = false }
+        before(:all) { Sidekiq.options[:local] = true }
         it_behaves_like :lock
       end
     end

data/spec/sidekiq/limit_fetch/global/monitor_spec.rb

@@ -1,13 +1,23 @@
 require 'spec_helper'
 
 describe Sidekiq::LimitFetch::Global::Monitor do
-  let(:global) { true }
   let(:monitor) { described_class.start! ttl, timeout }
   let(:ttl) { 1 }
   let(:queue) { Sidekiq::Queue[name] }
   let(:name) { 'default' }
 
   before :each do
+    # namespaces = [
+    #   described_class::PROCESSOR_NAMESPACE,
+    #   described_class::HEARTBEAT_NAMESPACE
+    # ]
+
+    # Sidekiq.redis do |it|
+    #   namespaces.flat_map {|namespace|
+    #     it.keys(namespace + '*')
+    #   }.each {|key| it.del key }
+    # end
+
     monitor
   end
 

data/spec/sidekiq/limit_fetch/queues_spec.rb

@@ -3,17 +3,17 @@ require 'spec_helper'
 describe Sidekiq::LimitFetch::Queues do
   subject { described_class.new options }
 
-  let(:queues) { %w[queue1 queue2] }
-  let(:limits) {{ 'queue1' => 3 }}
-  let(:strict) { true }
-  let(:global) { false }
-  let(:blocking) { nil }
+  let(:queues)   { %w[queue1 queue2] }
+  let(:limits)   {{ 'queue1' => 3 }}
+  let(:strict)   { true }
+  let(:local)    {}
+  let(:blocking) {}
 
   let(:options) do
-    { queues: queues,
-      limits: limits,
-      strict: strict,
-      global: global,
+    { queues:   queues,
+      limits:   limits,
+      strict:   strict,
+      local:    local,
       blocking: blocking }
   end
 
@@ -83,20 +83,20 @@ describe Sidekiq::LimitFetch::Queues do
     end
   end
 
-  context 'without global flag' do
+  context 'without local flag' do
     it_should_behave_like :selector
 
-    it 'without global flag should be local' do
-      subject.selector.should == Sidekiq::LimitFetch::Local::Selector
+    it 'without local flag should be global' do
+      subject.selector.should == Sidekiq::LimitFetch::Global::Selector
     end
   end
 
-  context 'with global flag' do
-    let(:global) { true }
+  context 'with local flag' do
+    let(:local) { true }
     it_should_behave_like :selector
 
-    it 'should use global selector' do
-      subject.selector.should == Sidekiq::LimitFetch::Global::Selector
+    it 'should use local selector' do
+      subject.selector.should == Sidekiq::LimitFetch::Local::Selector
     end
   end
 

data/spec/sidekiq/limit_fetch_spec.rb

@@ -11,7 +11,7 @@ describe Sidekiq::LimitFetch do
   end
 
   subject { described_class.new options }
-  let(:options) {{ queues: queues, limits: limits, global: global }}
+  let(:options) {{ queues: queues, limits: limits, local: local }}
   let(:queues) { %w(queue1 queue1 queue2 queue2) }
   let(:limits) {{ 'queue1' => 1, 'queue2' => 2 }}
 
@@ -36,12 +36,12 @@ describe Sidekiq::LimitFetch do
   end
 
   context 'global' do
-    let(:global) { true }
+    let(:local) { false }
     it_behaves_like :strategy
   end
 
   context 'local' do
-    let(:global) { false }
+    let(:local) { true }
     it_behaves_like :strategy
   end
 end

data/spec/spec_helper.rb

@@ -3,8 +3,8 @@ require 'sidekiq/limit_fetch'
 RSpec.configure do |config|
   config.before :each do
     Sidekiq::Queue.instance_variable_set :@instances, {}
-    Sidekiq.options[:global] = defined?(global) ? global : nil
-  
+    Sidekiq.options[:local] = defined?(local) ? local : nil
+
     Sidekiq.redis do |it|
       clean_redis = ->(queue) do
         it.del "limit_fetch:limit:#{queue}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - brainopia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq