zuora_connect 1.7.52 → 1.7.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d21589f508fa65c3b2c073b5a33c07daf8ef23d
-  data.tar.gz: d30be05bb1fe6221874ce9d805ecd2546a9aacc4
+  metadata.gz: 5fdd106c26a1f27acc4ec9aefb5aeb5e918803e1
+  data.tar.gz: 65b36ddcff35db5adbaf7e8a77c8eede3a934a22
 SHA512:
-  metadata.gz: 08824e9b7e2d2265f828a8e3f84cc5a5a620e6d8f0be995c43c0b5f61c671710d5c55286abd932ac0129877d49cb6d46303eb85c5efcd18ab96e9db3cb57ad81
-  data.tar.gz: 38ad857f9e819227b61f8cca5cf9a9acfee067ced5a36f892c657387d7b0d34f28826d539d730577a44c3cd7a7144bc65892f5701bfa264f2cdff14cd72a552d
+  metadata.gz: ada77e860004fcfe14dbc826e5e8ce636917ef372d9e7e78ce8c88bf85f0314ece2ad64aeea0bcf2d874a1fb82a00bcde7453ff89f905f0aca625ebc93de490e
+  data.tar.gz: 9b9594b3149efa9b9fd075bf8f5db2c9d4423fb1e8499f61167a1eec995f68fcaead6ab2edeef101b603ab41035c777366af10d25a6fe00a2cb5b520811c5ef6

data/lib/resque/dynamic_queues.rb

@@ -58,22 +58,26 @@ module Resque
 
       #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|
-          self.get_categorized_queues(grouped_queues[key]).each do |key, queues|
-            queues.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
+        if ZuoraConnect.configuration.blpop_queue
+          return get_job(grouped_queues)
+        else
+          @n ||= 0       
+          @n += 1
+          @n = @n % grouped_queues.keys.size
+          grouped_queues.keys.rotate(@n).each do |key|
+            self.get_categorized_queues(grouped_queues[key]).each do |key, queues|
+              queues.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.
           end
-          @n += 1 # Start the next search at the queue after the one from which we pick a job.
+          nil
         end
-        nil
       else 
         return reserve_without_round_robin
       end
@@ -84,6 +88,60 @@ module Resque
       raise e
     end
 
+    def create_job(queue, payload)
+      return unless payload
+      Resque::Job.new(queue, payload)
+    end
+
+    def get_job(grouped_queues)
+      get_restricted_job
+      get_queued_job(grouped_queues)
+    end
+
+    def get_next_job(grouped_queues)
+      @n ||= 0
+      queue_index = {}
+      grouped_queues.each_with_index do |(key, queue_list), index|
+        queue_list.each do |queue|
+          queue_index[queue] = index
+        end
+      end
+
+      grouped_queues = grouped_queues.values.rotate(@n).map{|queue_list| get_categorized_queues(queue_list).to_h.values.flatten}.flatten.delete_if{|queue| !should_work_on_queue?(queue)}.map{|queue| "queue:#{queue}"}
+      queue, payload = Resque.redis.blpop(grouped_queues)
+      queue = queue.split("queue:")[1]
+      @n = queue_index[queue] + 1
+      return create_job(queue, Resque.decode(payload))      
+    end
+
+    def get_restricted_job
+      Resque::Plugins::ConcurrentRestrictionJob.next_runnable_job_random
+    end
+
+    def get_queued_job(grouped_queues)
+      # Bounded retry
+      1.upto(Resque::Plugins::ConcurrentRestriction.reserve_queued_job_attempts) do |i|
+        resque_job = get_next_job(grouped_queues)
+
+        # Short-curcuit if a job was not found
+        return if resque_job.nil?
+
+        # If there is a job on regular queues, then only run it if its not restricted
+        job_class = resque_job.payload_class
+        job_args = resque_job.args
+
+        # Return to work on job if not a restricted job
+        return resque_job unless job_class.is_a?(ConcurrentRestriction)
+
+        # Keep trying if job is restricted. If job is runnable, we keep the lock until
+        # done_working
+        return resque_job unless job_class.stash_if_restricted(resque_job)
+      end
+
+      # Safety net, here in case we hit the upper bound and there are still queued items
+      return nil
+    end
+
     # Returns a list of queues to use when searching for a job.
     #
     # A splat ("*") means you want every queue (in alpha order) - this

data/lib/zuora_connect/configuration.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
 
     attr_accessor :default_locale, :default_time_zone, :url, :mode, :delayed_job,:private_key, :additional_apartment_models
 
-    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish
+    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
@@ -18,6 +18,7 @@ module ZuoraConnect
       @private_key = ENV["CONNECT_KEY"]
       @additional_apartment_models = []
       @silencer_resque_finish = true
+      @blpop_queue = false
       
       # Setting the app name for telegraf write
       @enable_metrics = false

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.52"
+  VERSION = "1.7.53"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.52
+  version: 1.7.53
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment