zuora_connect 1.7.32 → 1.7.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72754905411ed30ecc22d4d789857dcc8a026734
-  data.tar.gz: c540b406fa0cf51493ce0b03c05a16fe98c33a8c
+  metadata.gz: 2f654b5c863ebf96eb976039e87ffb65a17308e0
+  data.tar.gz: fa630ad385d7876d468aaa63695829f77e10e61d
 SHA512:
-  metadata.gz: 381257814cad9cb462615727b024d18c621e9bb9860ec619bef74df43e6e46c544126c49dfe7f331324c3fd3fa3d2e60f3b9d99c2ecf3dddf6c46cffed3db8da
-  data.tar.gz: 9c168032cdfa5aa65d62f62ede2b6011a3a74c2b2568c8eaa7feeaf783bb0745a05b71b30f57ffb321f21a6f7253b8875067d1b6f01e4a7f64c8b2caf02c1793
+  metadata.gz: abb8e9351ec64a2ee3ef7ba8c3e6cb28d08a345594eac30ab6f3941d23f19bc77a771f7471120e468f36872596f3e98ef7407af633b3d2fe383a869540b2f0f3
+  data.tar.gz: 2bcf6376f63b0fa8fcf4592ab1c3204dfefd60b0b219d27bac2a2411b11bec30f2a8ad7999c227f78d1826fa74e0960c81d3f4c40fecae6eba3535419968b156

data/lib/resque/dynamic_queues.rb

@@ -23,6 +23,18 @@ module Resque
       busy_queues.select {|q| q == queuename }.size
     end
 
+    def get_categorized_queues(queues)
+      priority_map = {"Synchronous" => 0, "High" => 1, "Medium" => 2, "Low" => 3}
+      categorized_queues = {}
+      for queue in queues.uniq
+        priority = queue.split("_")[1]
+        priority = "Medium" if !["Synchronous", "High", "Medium", "Low"].include?(priority)
+        categorized_queues[priority] ||= []
+        categorized_queues[priority].push(queue)
+      end
+      return categorized_queues.transform_keys{ |key| priority_map[key.to_s]}
+    end
+
     DEFAULT_QUEUE_DEPTH = 0
     def should_work_on_queue? queuename
       return true if @queues.include? '*'  # workers with QUEUES=* are special and are not subject to queue depth setting
@@ -37,6 +49,10 @@ module Resque
       false
     end
 
+    def get_grouped_queues(queues)
+      queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
+    end
+
     def reserve_with_round_robin
       grouped_queues = queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
 
@@ -45,13 +61,15 @@ module Resque
         @n ||= 0
         @n += 1
         @n = @n % grouped_queues.keys.size
-
         grouped_queues.keys.rotate(@n).each do |key|
-          grouped_queues[key].each do |queue|
-            log! "Checking #{queue}"
-            if should_work_on_queue?(queue) && @job_in_progress = Resque::Job.reserve(queue)
-              log! "Found job on #{queue}"
-              return @job_in_progress
+          categorized_queues = get_categorized_queues(grouped_queues[key])
+          for key in categorized_queues.keys.sort
+            categorized_queues[key].each do |queue|
+              log! "Checking #{queue}"
+              if should_work_on_queue?(queue) && @job_in_progress = Resque::Job.reserve(queue)
+                log! "Found job on #{queue}"
+                return @job_in_progress
+              end
             end
           end
           @n += 1 # Start the next search at the queue after the one from which we pick a job.

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.32"
+  VERSION = "1.7.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.32
+  version: 1.7.33
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment