zuora_connect 1.7.81y → 1.7.81z

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ea720863ce1fe37d6003298db12e63bd14860d5fce2ce9265eecbd34f623742
-  data.tar.gz: 9df0379c5f5bb077f59fb780681f7fba412b00e53ad4ea2f1c169e780d041be4
+  metadata.gz: 7b3981851d33ab348f316691961b5c7d285f484f694410a3346680c311ffe9e8
+  data.tar.gz: 8d420ab07b185af43e065328b06e3d6b298451bae6f1594371b4e307872d8849
 SHA512:
-  metadata.gz: 50900754abe513cc598891da74e573280373ca979179206bcb45e03d87b61e08af1b2e542926e76db33d69cbbf5a2a03e7dd203a7976c8943e80923b3bc385d4
-  data.tar.gz: 728ba29c67d3ac12084ecccced393e8be88cb1b738134c2613b0fc459cc619f01f16e4a4f97fa0135f88b70a6df484b5bb15dbb8c76b7612cdc24e007442e5d2
+  metadata.gz: c8142f4739b94aee5175713bd694fbdb239ca99b7aeb708290da0f1ba3c2e1aaeb1fc6f909f17b04afffe80ecc0a193e31b34fed45824c5c0849f3aa4a9fe107
+  data.tar.gz: 1aa946e26d50d4bedaf7828711b662921164b13469a77c8894dc0801a8daf0c2dd9cf586e3d651d347f50a7febbae153803ac54db3218200a28ace12b3c7d5b5

data/app/controllers/zuora_connect/static_controller.rb

@@ -26,6 +26,19 @@ module ZuoraConnect
     end
 
     def health
+      if params[:error].present?
+        begin 
+          raise ZuoraConnect::Exceptions::Error.new('This is an error')
+        rescue => ex
+          case params[:error]
+          when 'Log'  
+            Rails.logger.error(ex)
+          when 'Exception'
+            raise
+          end
+        end
+      end
+
       render json: {
         message: "Alive",
         status: 200

data/lib/resque/plugins/custom_logger.rb

@@ -7,7 +7,7 @@ module Resque
   module Plugins
     module CustomLogger
       def before_perform(*args)
-        Rails.logger.with_fields = { trace_id: SecureRandom.uuid, name: "RailsWorker"} if Rails.configuration.logger.class.to_s == 'Ougai::Logger'
+        Rails.logger.with_fields = { trace_id: SecureRandom.uuid, name: "RailsWorker"} if Rails.logger.class.to_s == 'Ougai::Logger'
         case args.class.to_s
         when "Array"
           if args.first.class == Hash
@@ -18,7 +18,9 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        Rails.logger.info({:msg => 'Starting job', :job => data}) if data.present?
+        data = {:msg => 'Starting job', :job => data}
+        data.merge!({:app_instance_id => data.dig(:job, 'app_instance_id')}) if data.dig(:job, 'app_instance_id').present?
+        Rails.logger.info(data) if data.present?
       end
     end
   end

data/lib/zuora_connect.rb

@@ -39,6 +39,14 @@ module ZuoraConnect
         logger.level = level
         logger.before_log = lambda do |data|
           data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
+          if Thread.current[:appinstance].present? 
+            data[:app_instance_id] = Thread.current[:appinstance].id
+            logitems = Thread.current[:appinstance].logitems
+            if logitems.present? && logitems.class == Hash
+              data[:tenant_ids] = logitems[:tenant_ids] if logitems[:tenant_ids].present?
+              data[:organization] = logitems[:organization] if logitems[:organization].present?
+            end
+          end
         end
       else
         logger = MonoLogger.new(STDOUT)
@@ -50,13 +58,22 @@ module ZuoraConnect
           end
 
           require 'json'
-          JSON.dump(
+          store = {
             name: name,
             level: serverity,
             timestamp: datetime.strftime('%FT%T.%6NZ'),
             pid: Process.pid,
             message: name == "ActionMailer" ? msg.strip : msg
-          ) + "\n"
+          }
+          if Thread.current[:appinstance].present? 
+            store[:app_instance_id] = Thread.current[:appinstance].id
+            logitems = Thread.current[:appinstance].logitems
+            if logitems.present? && logitems.class == Hash
+              store[:tenant_ids] = logitems[:tenant_ids] if logitems[:tenant_ids].present?
+              store[:organization] = logitems[:organization] if logitems[:organization].present?
+            end
+          end
+          JSON.dump(store) + "\n"
         end
       end
       return logger

data/lib/zuora_connect/railtie.rb

@@ -50,11 +50,11 @@ module ZuoraConnect
           exceptions = %w(controller action format id)
           items = {
             #time: event.time.strftime('%FT%T.%6N'),  
-            params: event.payload[:params].except(*exceptions),
-            exception: event.payload[:exception],
-            exception_object: event.payload[:exception_object],
-            process_id: Process.pid
+            params: event.payload[:params].except(*exceptions).to_json.to_s
           }
+          items.merge!({exception_object: event.payload[:exception_object]}) if event.payload[:exception_object].present?
+          items.merge!({exception: event.payload[:exception]}) if event.payload[:exception].present?
+
           if Thread.current[:appinstance].present? 
             items.merge!({appinstance_id: Thread.current[:appinstance].id, connect_user: Thread.current[:appinstance].connect_user, new_session: Thread.current[:appinstance].new_session_message})
             if Thread.current[:appinstance].logitems.present? && Thread.current[:appinstance].logitems.class == Hash

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.81y"
+  VERSION = "1.7.81z"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.81y
+  version: 1.7.81z
 platform: ruby
 authors:
 - Connect Team