zuora_connect 3.0.0.pre.c → 3.0.0.pre.h

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27fb22389a0778791fc2ecab5d1ad5bbd651f1b647712830b4e006102e28eecd
-  data.tar.gz: c5aaa8e152b214b12abf26383d46371377c4ef0fca324929e9ffc33952663600
+  metadata.gz: 7e450ae2dc3cd3261f03188ccabefde7de2d3ae20133afdaf37d6679eb2dea4b
+  data.tar.gz: 7bfb6699dce01ad64f66a5c3e32cbdd86c13f395c9dd4296cbf342d46103b136
 SHA512:
-  metadata.gz: edd9d1b187c9a517eaf91d643718ada56deec42eec78f6f570a93bcdd83e99d1b6ab1ffe41c2bb86f763139d1ab6e6ea66c36f5854a815356a5563494b990c11
-  data.tar.gz: 59a8465e0558022d280b08100c91ac77bdc955e55f24c19201c4d198b5720c4a3afdfa3650520fca8edcdc883fd81e2a3d152d1b1ba8b8f3c80a83d3e84e6c17
+  metadata.gz: 92847fcebbe8021d39052e4d7460e912088af09915fd0829c49ee723e574323b7ab75bbec49c53a306d5daf11d45e68f39cfde3b76facff2088df558c7c2358a
+  data.tar.gz: c2f4ea8ceeb5a5e9f6a793d4e6d7d49adfc9d209ac509b229a44c6afcf5d3e36c9bcb187d0aadd6db0e3fdb62b4d15151113bb68ce853832eb7ce4dda8ecec7a

data/app/models/zuora_connect/app_instance_base.rb

@@ -152,7 +152,8 @@ module ZuoraConnect
       if ZuoraConnect.configuration.mode != "Production"
         mock_task_data = {
           "id" => ZuoraConnect.configuration.dev_mode_appinstance,
-          "mode" => ZuoraConnect.configuration.dev_mode_mode
+          "mode" => ZuoraConnect.configuration.dev_mode_mode,
+          "name" => "Developer Instance"
         }
 
         case ZuoraConnect.configuration.dev_mode_options.class
@@ -168,7 +169,7 @@ module ZuoraConnect
         end
 
         self.build_task(task_data: mock_task_data, session: session)
-        self.set_backup_creds
+        self.set_backup_creds if !self['zuora_logins'].present?
         self.last_refresh = Time.now.to_i
       else
         time_expire = (session["#{self.id}::last_refresh"] || Time.now).to_i - INSTANCE_REFRESH_WINDOW.ago.to_i

data/lib/middleware/metrics_middleware.rb

@@ -34,8 +34,11 @@ module ZuoraConnect
         @bad_headers.each { |header| env.delete(header) }
 
         if defined?(Prometheus) && env['PATH_INFO'] == '/connect/internal/metrics'
+
           # Prometheus Stuff
-          metrics = ZuoraObservability::Metrics.resque
+          metrics = ZuoraObservability::Metrics.resque 
+          metrics = defined?(ZuoraConnect::AppInstance.get_metrics) ? ZuoraConnect::AppInstance.get_metrics(metrics) : metrics
+         
           redis_up = metrics.present? && metrics.dig(:Resque, :Workers_Total).present? ? 1 : 0
           Prometheus::REDIS_CONNECTION.set(redis_up)
 

data/lib/resque/plugins/app_instance_job.rb

@@ -12,14 +12,14 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        if Rails.logger.is_a?(Ougai::Logger) 
+        if Rails.logger.is_a?(Ougai::Logger) && !Rails.env.development?
           Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
         end
 
         begin
           connection_count ||= 0 
           @appinstance = ZuoraConnect::AppInstance.find(args['app_instance_id'].to_i)
-          Rails.logger.info('Starting job') 
+          Rails.logger.info('Starting job', job: data) 
 
           @appinstance.new_session(holding_pattern: true)
         rescue ActiveRecord::RecordNotFound => exception

data/lib/resque/plugins/custom_logger.rb

@@ -17,7 +17,7 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        if Rails.logger.is_a?(Ougai::Logger) 
+        if Rails.logger.is_a?(Ougai::Logger) && !Rails.env.development?
           Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
         end
         data = {:msg => 'Starting job', :job => data}

data/lib/zuora_connect/controllers/helpers.rb

@@ -680,7 +680,7 @@ module ZuoraConnect
         session["#{ZuoraConnect.configuration.dev_mode_appinstance}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
  
         values = {
-          id: ZuoraConnect.configuration.dev_mode_appinstance, 
+          id: ZuoraConnect.configuration.dev_mode_appinstance,
           access_token: ZuoraConnect.configuration.dev_mode_user, 
           refresh_token: ZuoraConnect.configuration.dev_mode_pass, 
           token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass, 
@@ -692,9 +692,9 @@ module ZuoraConnect
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin
-            Apartment::Tenant.create(values[:appinstance].to_s)
+            Apartment::Tenant.create(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
           rescue Apartment::TenantExists => ex
-            Apartment::Tenant.drop(values[:appinstance].to_s)
+            Apartment::Tenant.drop(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
             retry
           end
           @appinstance = ZuoraConnect::AppInstance.new()

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.0-c"
+  VERSION = "3.0.0-h"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.c
+  version: 3.0.0.pre.h
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment