zuora_connect 1.7.37 → 1.7.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e165cc15e9124725a8531bbb37fdedbffc2b0041
-  data.tar.gz: b30757389dd1b67751c462178d2d7aa519c9b9f7
+  metadata.gz: 3a3b72ddd611aeb3b3df95fb6bac3345d38139a1
+  data.tar.gz: ed96958f0447ad7eafe2a3a471a517e8850fd47d
 SHA512:
-  metadata.gz: 9a635b7ebd76c29e45a76cbfa55b92ae87949ae2bc2438621672487a6857636e6095c3183f6c124e2497128aa3eaa282bd5d95c11ae7a9a5ac63855f8033b1e4
-  data.tar.gz: bddf8ea1da0213428f64752286a6355880cc076e45c882455778ee66de1af803dd38d3a77da6dd65a66d49faed218343c5525f66a4ad23d00cbf4aaaf4432f51
+  metadata.gz: 4169982ec3d59a23526353c1f35c8b90ebea975b794bd66beea4e4aff7b6e9ca2426ccbeb679154443b49c53d77eb68991239acb2486fde33f61520af7b3aaaa
+  data.tar.gz: c85a12bd0507ec62a53b753547468a1514b4e6f23a8941bdce925c3d30e10d21b68844eca96ff28694ce39dd59266bcf41d48139072f345e9e7a9a7ca5a1c345

data/app/models/zuora_connect/app_instance_base.rb

@@ -23,7 +23,7 @@ module ZuoraConnect
       if INSTANCE_REFRESH_WINDOW > INSTANCE_REDIS_CACHE_PERIOD
         raise "The instance refresh window cannot be greater than the instance cache period"
       end
-      self.apartment_switch(nil, true)
+      self.apartment_switch(nil, false)
     end
 
     def apartment_switch(method = nil, migrate = false)

data/app/views/sql/refresh_aggregate_table.txt

@@ -74,7 +74,7 @@ BEGIN
           format('DROP INDEX IF EXISTS "public"."%s"', concat(aggregate_table_name, '_', index_id));
 
         EXECUTE
-          format(replace(replace(index_string, index_name, concat(aggregate_table_name, '_', index_id)), concat(' ', table_name, ' '), concat( ' ', aggregate_table_name, ' ')));
+          format(replace(replace(replace(index_string, index_name, concat(aggregate_table_name, '_', index_id)), concat(' ', table_name, ' '), concat( ' ', aggregate_table_name, ' ')), concat('public.', table_name), concat( 'public.', aggregate_table_name)));
 
         RAISE NOTICE 'Creating Indexes %', replace(replace(replace(index_string, index_name, concat(aggregate_table_name, '_', index_id)), concat(' ', table_name, ' '), concat( ' ', aggregate_table_name, ' ')), concat('public.', table_name), concat( 'public.', aggregate_table_name)) ;
       END;

data/lib/resque/dynamic_queues.rb

@@ -23,16 +23,16 @@ module Resque
       busy_queues.select {|q| q == queuename }.size
     end
 
-    def get_categorized_queues(queues)
+    def get_categorized_queues(queue_list)
       priority_map = {"Synchronous" => 0, "High" => 1, "Medium" => 2, "Low" => 3}
       categorized_queues = {}
-      for queue in queues.uniq
+      for queue in queue_list.uniq
         priority = queue.split("_")[1]
         priority = "Medium" if !["Synchronous", "High", "Medium", "Low"].include?(priority)
         categorized_queues[priority] ||= []
         categorized_queues[priority].push(queue)
       end
-      return categorized_queues.transform_keys{ |key| priority_map[key.to_s]}
+      return categorized_queues.transform_keys{ |key| priority_map[key.to_s]}.sort
     end
 
     DEFAULT_QUEUE_DEPTH = 0
@@ -50,11 +50,11 @@ module Resque
     end
 
     def get_grouped_queues
-      queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
+      self.queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
     end
 
     def reserve_with_round_robin
-      grouped_queues = get_grouped_queues
+      grouped_queues = self.get_grouped_queues
 
       #Instance queue grouping
       if !grouped_queues.keys.include?(nil) && grouped_queues.keys.size > 0
@@ -62,9 +62,8 @@ module Resque
         @n += 1
         @n = @n % grouped_queues.keys.size
         grouped_queues.keys.rotate(@n).each do |key|
-          categorized_queues = get_categorized_queues(grouped_queues[key])
-          for key in categorized_queues.keys.sort
-            categorized_queues[key].each do |queue|
+          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}"

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.37"
+  VERSION = "1.7.38"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.37
+  version: 1.7.38
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment