zuora_connect 1.7.54 → 1.7.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d077b3fe3e33f3f0fd383e8e54b25ff1712f950
-  data.tar.gz: ed6a49af88ffbec02f897993d1244cc4a7c91f3f
+  metadata.gz: e8cd456de5a165de07a5881d2f9193a07ef90556
+  data.tar.gz: e16915afc0bb6e2d56f20ee305ffa5746b894356
 SHA512:
-  metadata.gz: 9fe85df39cd2734b73eb42598eabdab43799b5a6d2f5a0afd2154ac7dff61172ba607e0adc620e6b96bef29d13152620f2c61a545b35c5d29b3c54c1c0fe45d5
-  data.tar.gz: 044501330ed1a4a703ca0da443ed0c5aaa313a31fef1067251e6ffb1add683504cf8b77cea808620010ff5294bc996aa951f47be38f5c86295de0aeac08a1ba8
+  metadata.gz: 142408e633010bf5379a3e0aceebb627c7e643dc861600708e0362f23e1cd2f8d3803d97145e063b9a163d8a9f25d4342304e89a6e8bca0a0e045bf6815f913d
+  data.tar.gz: 26e613fa91eca022a0002bb9e6922411158bf31680be9397e4225632be85436a654ba8ec76552bc05d8dec7ad748a4bae9c83da67d639a954b6d6b116ed227b4

data/lib/resque/dynamic_queues.rb

@@ -59,7 +59,10 @@ module Resque
       #Instance queue grouping
       if !grouped_queues.keys.include?(nil) && grouped_queues.keys.size > 0
         if ZuoraConnect.configuration.blpop_queue
-          return get_job(grouped_queues)
+          @job_in_progress = get_queued_job(grouped_queues)
+          return @job_in_progress if @job_in_progress.present?
+
+          return @job_in_progress = get_restricted_job
         else
           @n ||= 0       
           @n += 1
@@ -93,11 +96,6 @@ module Resque
       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 ||= 1
       queue_index = {}
@@ -119,27 +117,31 @@ module Resque
     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)
+      if defined?(Resque::Plugins::ConcurrentRestriction)
+        # 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?
+          # 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
+          # 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?(Resque::Plugins::ConcurrentRestriction)
+          # Return to work on job if not a restricted job
+          return resque_job unless job_class.is_a?(Resque::Plugins::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)
+          # 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        
+      else
+        return get_next_job(grouped_queues)
       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.

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.54"
+  VERSION = "1.7.55"
 end

metadata

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