zuora_connect 1.5.32 → 1.5.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 616c086c694841b9daf5d37a6183caef1a19dcc3
-  data.tar.gz: 1d1c561faa6707b7a33d8f19707a34c4b95493b5
+  metadata.gz: ec63ae977ac8d50176a476a4fba1fbfcfde76a4a
+  data.tar.gz: 68b56318ebac9ea729bc1815b16a404aa72d9e82
 SHA512:
-  metadata.gz: 71415ba2c52c037051fb5f2beec09ed22f9f88283769222e8ca5b43dd9fe77333f83e57cdb74663d2549b86146e7940d65896932969c379663b031ad6deb651d
-  data.tar.gz: 529ca7bf5106cc79759c2ef1c2488257c54348c994bf949dbadabd3ea0f3bded5aff30adb0e3990f3c40f2c8e69435cb3bcd93f0c39d7ceb9819dff6d2724e8c
+  metadata.gz: 746cad8f7f8dee1097bdc1de0dec4328d42e68e75f14896c8a728130a3fa992bfffa4d9f8261f74ec4caf47f898301aa53f16a5bfb8660d0ccbe48eddaf02e6e
+  data.tar.gz: 01fa812637ec9ff3d69d270636486fa4c9462d8a23e9fe595375c9c6471748b97ea995720c729bdc94c82fb75b32fca4dc3b6b6aeaa3cf8b9dc6b9c1f4e29771

data/lib/resque/dynamic_queues.rb

@@ -38,18 +38,29 @@ module Resque
     end
 
     def reserve_with_round_robin
-      qs = rotated_queues
-      qs.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
-        # Start the next search at the queue after the one from which we pick a job.
+      grouped_queues = queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
+
+      #Instance queue grouping
+      if !grouped_queues.keys.include?(nil) && grouped_queues.keys.size > 0
+        @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
+            end
+          end
+          @n += 1 # Start the next search at the queue after the one from which we pick a job.
+        end
+        nil
+      else 
+        return reserve_without_round_robin
       end
-
-      nil
+      
     rescue Exception => e
       log "Error reserving job: #{e.inspect}"
       log e.backtrace.join("\n")
@@ -79,7 +90,7 @@ module Resque
 
       #Remove Queues under Api Limits
       api_limit_instances = Redis.current.keys('APILimits:*').map {|key| key.split('APILimits:').last.to_i}
-      real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)}
+      real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)} ## 2
       
       #Queue Pausing 
       paused_instances = Redis.current.keys('resque:PauseQueue:*').map {|key| key.split('resque:PauseQueue:').last.to_i}

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.5.32"
+  VERSION = "1.5.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.32
+  version: 1.5.33
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment