zuora_connect 2.0.56 → 2.0.57a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5757fa9b968c3c2733f1cabbbfacefcc3bd916ed768ccc7acb2e840e737033
-  data.tar.gz: a198e4dc187c50829d692b54802573a7095924e60045b0f713a0ed7e4bf1a3fe
+  metadata.gz: e86fd72050ec0f2e4a7734889824758273744052b3bfd0e4e1d100386dc4a4bd
+  data.tar.gz: 1215bcdb264bb920d3dcd054b79f8d9f204cb863ee71434b564c7ea208641c9c
 SHA512:
-  metadata.gz: 6a9b10960b926c602c453907607581e44bb79687bd73dc1801ded464032e2c3c7f8559eadb6b610438adb9721f47ed16f8340ec695b9a2e4f5fa062192a1656e
-  data.tar.gz: 953d81773108dfa97f66e1364fe91380ece8ae2f5b8945d20d414dad4db0412b6b62e95f509a1aabd14a3f9039058f861a6d8b6aa36cbfe2ac0f6fcb6bada588
+  metadata.gz: 1742d055704ed7bc97e31cbcad1a20a516434ccbd2d69275f77738ed62f80cc86f48148616ef92a87afe5e144e9687041d6c82c0a630af8e7bb1626a89af4172
+  data.tar.gz: 48a2917c0222294af49c0523f0f032b725136c62e9f31ef47dc612c39af98676e9832e85b6dda355b521dc18ad93b95e4ad9c7d3aaceed57607bac3e2568e342

data/lib/resque/dynamic_queues.rb

@@ -101,20 +101,33 @@ module Resque
     end
 
     def get_next_job(grouped_queues)
-      @n ||= 1
-      queue_index = {}
-      grouped_queues.each_with_index do |(key, queue_list), index|
-        queue_list.each do |queue|
-          queue_index[queue] = index
-        end
+      @n ||= 0
+
+      low_priority_queues = []
+      high_priority_queues = []
+
+      # Categorize queues as low_priority if its appinstance id is lower than current
+      grouped_queues.sort_by { |app_instance_id, _| app_instance_id.to_i }.each do |app_instance_queues|
+        app_instance_id, queues = app_instance_queues
+        queues = get_categorized_queues(queues).to_h.values.flatten
+        app_instance_id.to_i <= @n ? low_priority_queues.push(queues) : high_priority_queues.push(queues)
       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}"}
+      # Reorder queue groups by putting high priority queues in the front
+      grouped_queues =
+        (high_priority_queues + low_priority_queues).
+        flatten.
+        delete_if { |queue| !should_work_on_queue?(queue) }.
+        map { |queue| "queue:#{queue}" }
+
       queue, payload = get_job_from_queues(grouped_queues)
       return nil if queue.blank?
       
       queue = queue.split("queue:")[1]
-      @n = queue_index[queue] + 1
+
+      # track last app instance id
+      @n = queue.split('_').first.to_i
+
       return create_job(queue, Resque.decode(payload))      
     end
 

data/lib/zuora_connect.rb

@@ -23,6 +23,8 @@ module ZuoraConnect
       case Rails.env.to_s
       when 'development'
         Rails.logger
+       when 'test'
+        Rails.logger
       else
         @logger ||= custom_logger(name: "Connect", level: Rails.logger.level)
       end

data/lib/zuora_connect/configuration.rb

@@ -7,7 +7,7 @@ module ZuoraConnect
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
-    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :json_logging
+    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :json_logging, :insert_migrations
 
     def initialize
       @default_locale = :en
@@ -19,6 +19,7 @@ module ZuoraConnect
       @additional_apartment_models = []
       @silencer_resque_finish = true
       @blpop_queue = false
+      @insert_migrations = true
 
       # Setting the app name for telegraf write
       @enable_metrics = false
@@ -42,7 +43,7 @@ module ZuoraConnect
       @aws_region = "us-west-2"
       @s3_bucket_name = "rbm-apps"
       @s3_folder_name = Rails.application.class.parent_name
-      @json_logging = Rails.env.to_s == 'development' ? false : true
+      @json_logging = Rails.env.development? || Rails.env.test? ? false : true
     end
 
     def private_key

data/lib/zuora_connect/engine.rb

@@ -16,10 +16,13 @@ module ZuoraConnect
       end
     end
 
+
     initializer :append_migrations do |app|
-      unless app.root.to_s.match root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
+      if ZuoraConnect.configuration.insert_migrations
+        unless app.root.to_s.match root.to_s
+          config.paths["db/migrate"].expanded.each do |expanded_path|
+            app.config.paths["db/migrate"] << expanded_path
+          end
         end
       end
     end

data/lib/zuora_connect/railtie.rb

@@ -46,7 +46,7 @@ module ZuoraConnect
       require 'lograge'
       
       Rails.configuration.logger = ZuoraConnect.custom_logger(name: "Rails") 
-      if Rails.env != 'development'
+      if !Rails.env.test? && !Rails.env.development?
         Rails.configuration.lograge.enabled = true
         Rails.configuration.colorize_logging = false
       end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.56"
+  VERSION = "2.0.57a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.56
+  version: 2.0.57a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -415,9 +415,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: