zuora_connect 2.0.5v → 2.0.5w

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1f2b88fd1b3305c5c677d14f745aea85335bee8cedac9200de6f827958c69d8
-  data.tar.gz: 4fcd495431d0068a304f725607e0269c3a6eaab05eb0d2e0f59ec8630deaad6d
+  metadata.gz: eb3e213c5a0224ae13ca2b9cc309bd1fc90e898275e2910ffcdb56f9c3d273a7
+  data.tar.gz: a1dc3a39d74e809c6bec463c4e31f11b326af8d19d369829aa8f703bf65e9edf
 SHA512:
-  metadata.gz: 0b5d44b0ce40d3a170245a72f21b7a986913d2ccdc8f2c65c43cd9ab60ff1cd869d31b7ea591c45257858f3aeab51509f7a9c4bb4074566835799489ba85915d
-  data.tar.gz: 301b473fe5774e8dfb3526daa2a7fb854f68253c7c438a4e5398249822395db2cd37708f5b65015366c1f2b78232abdde7c03d2e1efff2920d59b9750e298a10
+  metadata.gz: 6d393169d0bbb1c9bbbae8b4c17d784292d65db56f25067540d0883382e4ba79c8880c511084e9399f0970aac14cd54d4aa388334466e07da700e06893233d5b
+  data.tar.gz: 9e4a4d2cc55a4d38bdc7f35074be3abc02364948b0704554a8e6637812939f8671864fe35cc08d6ac7727a7ea837f36af3aacfeb003424c5aa6843c4f88cae44

data/app/controllers/zuora_connect/static_controller.rb

@@ -34,6 +34,7 @@ module ZuoraConnect
     def initialize_app
       begin
         authenticate_connect_app_request
+        @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
         render json: {
           message: "Success",
           status: 200

data/app/models/zuora_connect/app_instance_base.rb

@@ -16,7 +16,7 @@ module ZuoraConnect
     BLANK_OBJECT_ID_LOOKUP = 'BlankValueSupplied'
     HOLDING_PATTERN_SLEEP = 5.seconds
     CONNECT_COMMUNICATION_SLEEP= 5.seconds
-    IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh']
+    IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
 
@@ -229,6 +229,7 @@ module ZuoraConnect
       end
     rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
       if (refresh_count += 1) < 3
+        sleep(30)
         ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
         retry
       else

data/lib/zuora_connect/controllers/helpers.rb

@@ -180,7 +180,7 @@ module ZuoraConnect
                   }
                   return
                 end
-
+                Apartment::Tenant.switch!("public")
                 ActiveRecord::Base.transaction do
                   ActiveRecord::Base.connection.execute('LOCK public.zuora_users IN ACCESS EXCLUSIVE MODE')
                   appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
@@ -286,7 +286,7 @@ module ZuoraConnect
           setup_instance_via_dev_mode
         end
 
-        if !defined?(@appinstance) 
+        if !defined?(@appinstance) || @appinstance.blank?
           render "zuora_connect/static/error_handled", :locals => {
             :title => "Application state could not be found.", 
             :message => "Please relaunch application."

data/lib/zuora_connect/railtie.rb

@@ -31,13 +31,33 @@ module ZuoraConnect
     ActiveSupport::Notifications.subscribe('process_action.action_controller', ZuoraConnect::PageRequest.new)
 
     initializer(:rails_stdout_logging, before: :initialize_logger) do
-      if Rails.env != 'development' && !ENV['DEIS_APP'].blank?
-        require 'lograge'
-  
-        Rails.configuration.logger = ZuoraConnect.custom_logger(name: "Rails") 
+      require 'lograge'
+      Rails.configuration.logger = ZuoraConnect.custom_logger(name: "Rails") 
 
+      if Rails.env != 'development'
         Rails.configuration.lograge.enabled = true
         Rails.configuration.colorize_logging = false
+      else
+        Rails.configuration.logger.before_log = lambda do |data|
+        end
+        Rails.configuration.logger.formatter = Ougai::Formatters::Customizable.new(
+          format_err: proc do |data|
+            next nil unless data.key?(:err)
+            err = data.delete(:err)
+            "  #{err[:name]} (#{err[:message]})\n #{err[:stack]}"
+          end,
+          format_data: proc do |data|
+            format('%s %s: %s', 'DATA'.ljust(6), Time.now.strftime('%FT%T.%6NZ'), "#{data.to_json}") if data.present?
+          end,
+          format_msg: proc do |severity, datetime, _progname, data|
+            msg = data.delete(:msg)
+            format('%s %s: %s', severity.ljust(6), datetime, msg)
+          end
+        )
+        Rails.configuration.logger.formatter.datetime_format = '%FT%T.%6NZ'
+      end
+
+      if Rails.configuration.lograge.enabled
         if Rails.configuration.logger.class.to_s == 'Ougai::Logger'
           Rails.configuration.lograge.formatter = Class.new do |fmt|
             def fmt.call(data)

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5v"
+  VERSION = "2.0.5w"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5v
+  version: 2.0.5w
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ougai-formatters-customizable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zuora_api
   requirement: !ruby/object:Gem::Requirement