zuora_connect 1.5.04 → 1.5.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 824aaae9f843edae29e1d76e21fa69a575ff2e47
-  data.tar.gz: 7b387043e25d6227a60f640ec988e73ee724e46a
+  metadata.gz: 38ebbf8e4e71e1ce0ae67c1aca670320ea0d6e86
+  data.tar.gz: ac04a93240de4a8f3ee9bda2900272f6cd7020e5
 SHA512:
-  metadata.gz: e234f53cec985f83a88d22bf4aad67a6b269cc4987edca3e30aa91fbed1bf51540d8735c9f6c338cd05520895879ef718912a53efce85e18901f0cd2c249d174
-  data.tar.gz: e3a8601d48936dfd55c2bec6fda15343d6bb520b649d0a92dcf7841dbc967773688b0d335a21fa5fab5be80d1aab0929e9d05260ecfbeba57ec42ce57e2bd13b
+  metadata.gz: 0b571056ef4af2e385cb2f7aa53b26d4fd3e20d5177df7d6e72168ce2fb4eb291e1b00fe40c97b112e9fcc3484e9a9c4d5a38efe437c6cf53b0b7ed5f008d8a4
+  data.tar.gz: 51d6b3e43835c5d82e16cb85a952fd5a200d9f99762954c0658f168cb0bf3fe05757f033448fee7112c59d0123ec2b109ee09fdcec2872c02b53870a20defa49

data/config/initializers/resque.rb

@@ -1,5 +1,5 @@
 if defined?(Resque::Worker)
   Resque.send(:extend, Resque::Additions)
-  #Resque::Worker.send(:include, Resque::DynamicQueues)
+  Resque::Worker.send(:include, Resque::DynamicQueues)
   Resque::Job.send(:include, Resque::SelfLookup)
 end

data/lib/resque/dynamic_queues.rb

@@ -1,5 +1,61 @@
 module Resque
   module DynamicQueues
+    def filter_busy_queues qs
+      busy_queues = Resque::Worker.working.map { |worker| worker.job["queue"] }.compact
+      Array(qs.dup).compact - busy_queues
+    end
+
+    def rotated_queues
+      @n ||= 0
+      @n += 1
+      rot_queues = queues # since we rely on the resque-dynamic-queues plugin, this is all the queues, expanded out
+      if rot_queues.size > 0
+        @n = @n % rot_queues.size
+        rot_queues.rotate(@n)
+      else
+        rot_queues
+      end
+    end
+
+    def queue_depth queuename
+      busy_queues = Resque::Worker.working.map { |worker| worker.job["queue"] }.compact
+      # find the queuename, count it.
+      busy_queues.select {|q| q == queuename }.size
+    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
+      max = DEFAULT_QUEUE_DEPTH
+      unless ENV["RESQUE_QUEUE_DEPTH"].nil? || ENV["RESQUE_QUEUE_DEPTH"] == ""
+        max = ENV["RESQUE_QUEUE_DEPTH"].to_i
+      end
+      return true if max == 0 # 0 means no limiting
+      cur_depth = queue_depth(queuename)
+      log! "queue #{queuename} depth = #{cur_depth} max = #{max}"
+      return true if cur_depth < max
+      false
+    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.
+        @n += 1
+      end
+
+      nil
+    rescue Exception => e
+      log "Error reserving job: #{e.inspect}"
+      log e.backtrace.join("\n")
+      raise e
+    end
+
     # Returns a list of queues to use when searching for a job.
     #
     # A splat ("*") means you want every queue (in alpha order) - this
@@ -67,6 +123,8 @@ module Resque
       receiver.class_eval do
         alias queues_without_dynamic queues
         alias queues queues_with_dynamic
+        alias reserve_without_round_robin reserve
+        alias reserve reserve_with_round_robin
       end
     end
   end

data/lib/zuora_connect/railtie.rb

@@ -13,7 +13,7 @@ module ZuoraConnect
     end
 
     initializer(:rails_stdout_logging, before: :initialize_logger) do
-      if true || Rails.env != 'development' && !ENV['DEIS_APP'].blank?
+      if Rails.env != 'development' && !ENV['DEIS_APP'].blank?
         require 'lograge'
         logger           = ActiveSupport::Logger.new(STDOUT)
         logger.formatter = ::Logger::Formatter.new

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.5.04"
+  VERSION = "1.5.05"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.04
+  version: 1.5.05
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment