sidekiq-dynamic-queues 0.5.5 → 0.5.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.5.6 (06/13/2013)
+------------------
+
+do setup in config_server block to avoid loading of Fetch class when not running server <ed484a0> [Matt Conway]
+
 0.5.5 (06/13/2013)
 ------------------
 

data/README.md

@@ -10,8 +10,12 @@ If creating a gem of your own that uses sidekiq-dynamic-queues, you may have to
 
     require 'sidekiq-dynamic-queues'
 
-Configure by setting Sidekiq.options[:fetch] = Sidekiq::DynamicQueues::Fetch
-
+Configure by:
+ 
+    Sidekiq.configure_server do |config|
+        config.options[:fetch] = Sidekiq::DynamicQueues::Fetch
+    end
+    
 Start your workers with a queue that can contain '\*' (.star.) for zero-or more of any character, '!' (.not.) to exclude the following pattern, or @key (.at.key) to look up the patterns from redis.  The version in parens is required to get around the sidekiq cli's restriction on queue names.  Some examples help:
 
     sidekiq -q foo

data/lib/sidekiq/dynamic_queues/attributes.rb

@@ -58,6 +58,59 @@ module Sidekiq
         result[FALLBACK_KEY] ||= ['*']
         return result
       end
+      
+      # Returns a list of queues to use when searching for a job.
+      #
+      # A splat ("*") means you want every queue (in alpha order) - this
+      # can be useful for dynamically adding new queues.
+      #
+      # The splat can also be used as a wildcard within a queue name,
+      # e.g. "*high*", and negation can be indicated with a prefix of "!"
+      #
+      # An @key can be used to dynamically look up the queue list for key from redis.
+      # If no key is supplied, it defaults to the worker's hostname, and wildcards
+      # and negations can be used inside this dynamic queue list.   Set the queue
+      # list for a key with
+      # Sidekiq::DynamicQueues::Attributes.set_dynamic_queue(key, ["q1", "q2"]
+      #
+      def expand_queues(queues)
+        queue_names = queues.dup
+
+        real_queues = Sidekiq::Client.registered_queues
+        matched_queues = []
+
+        while q = queue_names.shift
+          q = q.to_s
+
+          if q =~ /^(!)?@(.*)/
+            key = $2.strip
+            key = hostname if key.size == 0
+
+            add_queues = get_dynamic_queue(key)
+            add_queues.map! { |q| q.gsub!(/^!/, '') || q.gsub!(/^/, '!') } if $1
+
+            queue_names.concat(add_queues)
+            next
+          end
+
+          if q =~ /^!/
+            negated = true
+            q = q[1..-1]
+          end
+
+          patstr = q.gsub(/\*/, ".*")
+          pattern = /^#{patstr}$/
+          if negated
+            matched_queues -= matched_queues.grep(pattern)
+          else
+            matches = real_queues.grep(/^#{pattern}$/)
+            matches = [q] if matches.size == 0 && q == patstr
+            matched_queues.concat(matches)
+          end
+        end
+
+        return matched_queues.collect { |q| "queue:#{q}" }.uniq.sort
+      end
 
     end
     

data/lib/sidekiq/dynamic_queues/fetch.rb

@@ -1,9 +1,13 @@
-require 'forwardable'
+require 'sidekiq/fetch'
 
 module Sidekiq
   module DynamicQueues
 
-    # enable with Sidekiq.options[:fetch] = Sidekiq::DynamicQueues::Fetch
+    # enable with:
+    #    Sidekiq.configure_server do |config|
+    #        config.options[:fetch] = Sidekiq::DynamicQueues::Fetch
+    #    end
+    #
     class Fetch < Sidekiq::BasicFetch
 
       include Sidekiq::Util
@@ -19,67 +23,13 @@ module Sidekiq
         if @dynamic_queues.grep(/(^!)|(^@)|(\*)/).size == 0
           super
         else
-          queues = expanded_queues
+          queues = expand_queues(@dynamic_queues)
           queues = @strictly_ordered_queues ? queues : queues.shuffle
           queues << "queue:default" if queues.size == 0
           queues << Sidekiq::Fetcher::TIMEOUT
         end
       end
       
-      # Returns a list of queues to use when searching for a job.
-      #
-      # A splat ("*") means you want every queue (in alpha order) - this
-      # can be useful for dynamically adding new queues.
-      #
-      # The splat can also be used as a wildcard within a queue name,
-      # e.g. "*high*", and negation can be indicated with a prefix of "!"
-      #
-      # An @key can be used to dynamically look up the queue list for key from redis.
-      # If no key is supplied, it defaults to the worker's hostname, and wildcards
-      # and negations can be used inside this dynamic queue list.   Set the queue
-      # list for a key with
-      # Sidekiq::DynamicQueues::Attributes.set_dynamic_queue(key, ["q1", "q2"]
-      #
-      def expanded_queues
-        queue_names = @dynamic_queues.dup
-
-        real_queues = Sidekiq::Client.registered_queues
-        matched_queues = []
-
-        while q = queue_names.shift
-          q = q.to_s
-
-          if q =~ /^(!)?@(.*)/
-            key = $2.strip
-            key = hostname if key.size == 0
-
-            add_queues = get_dynamic_queue(key)
-            add_queues.map! { |q| q.gsub!(/^!/, '') || q.gsub!(/^/, '!') } if $1
-
-            queue_names.concat(add_queues)
-            next
-          end
-
-          if q =~ /^!/
-            negated = true
-            q = q[1..-1]
-          end
-
-          patstr = q.gsub(/\*/, ".*")
-          pattern = /^#{patstr}$/
-          if negated
-            matched_queues -= matched_queues.grep(pattern)
-          else
-            matches = real_queues.grep(/^#{pattern}$/)
-            matches = [q] if matches.size == 0 && q == patstr
-            matched_queues.concat(matches)
-          end
-        end
-
-        return matched_queues.collect { |q| "queue:#{q}" }.uniq.sort
-      end
-
-      
       def self.translate_from_cli(*queues)
         queues.collect do |queue|
           queue.gsub('.star.', '*').gsub('.at.', '@').gsub('.not.', '!')

data/lib/sidekiq/dynamic_queues/server.rb

@@ -22,9 +22,7 @@ module Sidekiq
           @queues = []
           dqueues = Attr.get_dynamic_queues
           dqueues.each do |k, v|
-            fetch = Fetch.new(:queues => ["@#{k}"], :strict => true)
-            expanded = fetch.queues_cmd
-            expanded.pop
+            expanded = Attr.expand_queues(["@#{k}"])
             expanded = expanded.collect {|q| q.split(":").last }
             view_data = {
                 'name' => k,

data/lib/sidekiq/dynamic_queues/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module DynamicQueues
-    VERSION = "0.5.5"
+    VERSION = "0.5.6"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: sidekiq-dynamic-queues
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Matt Conway