attributes.rb in sidekiq-dynamic-queues-0.6.0

- old
+ new

@@ -8,25 +8,25 @@
       extend self
 
       def json_encode(data)
         Sidekiq.dump_json(data)
       end
-      
+
       def json_decode(data)
         return nil unless data
         Sidekiq.load_json(data)
       end
-      
+
       def get_dynamic_queue(key, fallback=['*'])
         data = Sidekiq.redis {|r| r.hget(DYNAMIC_QUEUE_KEY, key) }
         queue_names = json_decode(data)
 
         if queue_names.nil? || queue_names.size == 0
           data = Sidekiq.redis {|r| r.hget(DYNAMIC_QUEUE_KEY, FALLBACK_KEY) }
           queue_names = json_decode(data)
         end
-        
+
         if queue_names.nil? || queue_names.size == 0
           queue_names = fallback
         end
 
         return queue_names
@@ -37,11 +37,11 @@
           Sidekiq.redis {|r| r.hdel(DYNAMIC_QUEUE_KEY, key) }
         else
           Sidekiq.redis {|r| r.hset(DYNAMIC_QUEUE_KEY, key, json_encode(values)) }
         end
       end
-      
+
       def set_dynamic_queues(dynamic_queues)
         Sidekiq.redis do |r|
           r.multi do
             r.del(DYNAMIC_QUEUE_KEY)
             dynamic_queues.each do |k, v|
@@ -56,11 +56,11 @@
         queues = Sidekiq.redis {|r| r.hgetall(DYNAMIC_QUEUE_KEY) }
         queues.each {|k, v| result[k] = json_decode(v) }
         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.
       #
@@ -74,11 +74,11 @@
       # Sidekiq::DynamicQueues::Attributes.set_dynamic_queue(key, ["q1", "q2"]
       #
       def expand_queues(queues)
         queue_names = queues.dup
 
-        real_queues = Sidekiq::Client.registered_queues
+        real_queues = Sidekiq::Queue.all.map(&:name)
         matched_queues = []
 
         while q = queue_names.shift
           q = q.to_s
 
@@ -111,8 +111,8 @@
 
         return matched_queues.collect { |q| "queue:#{q}" }.uniq.sort
       end
 
     end
-    
+
   end
 end