sidekiq-limit_fetch 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 674ddce501d3c50f771a21a1e7546513af0a2669
-  data.tar.gz: f6bd2050d3e7eea9b599fc1989680b77c3e7de85
+  metadata.gz: 4db872c28ebde76d915d79b0a0bdbdbcf9859b38
+  data.tar.gz: 9c6104f1869c2979a9e908f01ca6035d3319e134
 SHA512:
-  metadata.gz: e6e72377703afe1307173b6174c41bae6e4d819222431c061b2d16339a678e45968c3b51101f4a96e11253f8df17910b76a343870f1a306e322dafe7aab84e89
-  data.tar.gz: fc59c7b2b8c779556914a2d4aeea8282354df0a2e19154f99513a02ff8d013642b4e68fce46959d2b311a0a30d5c41bbc999d7a5a55cb7a949a8255cb9a1d716
+  metadata.gz: 28706d72d599cc68bb431edafdbfb886a4438b92e165257ae5fe862aee16899d530a5c96fa42c75a2f7f8155105e6d0219bdbfb91493d1bfd7c49eff26dcf605
+  data.tar.gz: 4dc6225e29e2aa26a64867f9dda5eee538000e443e713da38bd3b4d124aa5bfafbf563ec72214e6df120e90af30af5a7d5cdac014426196b398adfb90e637e2f

data/Rakefile

@@ -2,4 +2,11 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
-task default: :spec
+
+task :default do
+  rspec = Rake::Task[:spec]
+  rspec.invoke
+  ENV['namespace'] = 'namespace'
+  rspec.reenable
+  rspec.invoke
+end

data/benchmarks/compare.rb

@@ -8,7 +8,7 @@ limit       = ARGV.shift
 if limit
   limit = nil if limit == 'nil'
 
-  $:.unshift File.expand_path './lib'
+  $:.unshift File.expand_path '../lib'
   require 'sidekiq-limit_fetch'
   Sidekiq::Queue['inline'].limit = limit
   Sidekiq.redis {|it| it.del 'limit_fetch:probed:inline' }

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

@@ -2,11 +2,11 @@ module Sidekiq::LimitFetch::Global
   module Selector
     extend self
 
-    def acquire(queues)
+    def acquire(queues, namespace)
       redis_eval :acquire, [namespace, uuid, queues]
     end
 
-    def release(queues)
+    def release(queues, namespace)
       redis_eval :release, [namespace, uuid, queues]
     end
 
@@ -22,13 +22,6 @@ module Sidekiq::LimitFetch::Global
 
     private
 
-    def namespace
-      @namespace ||= begin
-        namespace = Sidekiq.options[:namespace]
-        namespace + ':' if namespace
-      end
-    end
-
     def redis_eval(script_name, args)
       Sidekiq.redis do |it|
         begin

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

@@ -1,7 +1,6 @@
 module Sidekiq::LimitFetch::Global
   class Semaphore
-    extend Forwardable
-    def_delegator Sidekiq, :redis
+    include Sidekiq::LimitFetch::Redis
 
     PREFIX = 'limit_fetch'
 
@@ -19,7 +18,7 @@ module Sidekiq::LimitFetch::Global
     end
 
     def acquire
-      Selector.acquire([@name]).size > 0
+      Selector.acquire([@name], determine_namespace).size > 0
     end
 
     def release

data/lib/sidekiq/limit_fetch/queues.rb

@@ -3,7 +3,9 @@ class Sidekiq::LimitFetch
     THREAD_KEY = :acquired_queues
 
     def initialize(options)
-      @queues = options[:queues]
+      @queues    = options[:queues]
+      @namespace = options[:namespace]
+
       options[:strict] ? strict_order! : weighted_order!
 
       set_limits options[:limits]
@@ -11,7 +13,7 @@ class Sidekiq::LimitFetch
     end
 
     def acquire
-      selector.acquire(ordered_queues)
+      selector.acquire(ordered_queues, @namespace)
         .tap {|it| save it }
         .map {|it| "queue:#{it}" }
     end
@@ -19,7 +21,7 @@ class Sidekiq::LimitFetch
     def release_except(full_name)
       queues = restore
       queues.delete full_name[/queue:(.*)/, 1] if full_name
-      selector.release queues
+      selector.release queues, @namespace
     end
 
     private

data/lib/sidekiq/limit_fetch/redis.rb

@@ -1,13 +1,27 @@
 module Sidekiq::LimitFetch::Redis
+  extend self
+
   # prevent blocking of fetcher
   # more bullet-proof and faster (O_O)
   # than using Celluloid::IO
-  def redis
-    Sidekiq.redis do |redis|
+  def nonblocking_redis
+    redis do |redis|
       begin
         Celluloid::Future.new { yield redis }.value
       end
     end
   rescue Celluloid::Task::TerminatedError
   end
+
+  def redis
+    Sidekiq.redis {|it| yield it }
+  end
+
+  def determine_namespace
+    redis do |it|
+      if it.respond_to?(:namespace) and it.namespace
+        it.namespace + ':'
+      end
+    end
+  end
 end

data/lib/sidekiq/limit_fetch.rb

@@ -21,7 +21,7 @@ class Sidekiq::LimitFetch
 
   def initialize(options)
     Global::Monitor.start!
-    @queues = Queues.new options
+    @queues = Queues.new options.merge(namespace: determine_namespace)
   end
 
   def retrieve_work
@@ -39,6 +39,6 @@ class Sidekiq::LimitFetch
 
   def redis_brpop(*args)
     return if args.size < 2
-    redis {|it| it.brpop *args }
+    nonblocking_redis {|it| it.brpop *args }
   end
 end

data/sidekiq-limit_fetch.gemspec

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

data/spec/sidekiq/limit_fetch/queues_spec.rb

@@ -12,7 +12,8 @@ describe Sidekiq::LimitFetch::Queues do
     { queues:   queues,
       limits:   limits,
       strict:   strict,
-      blocking: blocking }
+      blocking: blocking,
+      namespace: Sidekiq::LimitFetch::Redis.determine_namespace }
   end
 
   it 'should acquire queues' do

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ require 'sidekiq/limit_fetch'
 require 'celluloid/autostart'
 require 'sidekiq/fetch'
 
+Sidekiq.logger = nil
+Sidekiq.redis = { namespace: ENV['namespace'] }
+
 RSpec.configure do |config|
   config.before :each do
     Sidekiq.redis do |it|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1
 platform: ruby
 authors:
 - brainopia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq