zuora_connect 2.0.5x → 2.0.5y

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b58620dbacfe10f8e856d42be1de0a659d99231b3c356ef24bebd043fec9027a
-  data.tar.gz: 3d9de229195db89060afb9ef10db17b2a8ed9eb8ad22a3eb347b52a4303f656d
+  metadata.gz: ee905da43d4b965a647b9149ec7988f032c76afcc37dbffc934ac70eed7a8e2f
+  data.tar.gz: fc34629d958f8330fdabe0894f8e9d6c7af82b8b578ca3e2136b187c47dc3e00
 SHA512:
-  metadata.gz: '02782adbaf6f56861315865a65d5f5cf7da9c5f29d61de9245c41ab8f0841695ad310a93be3abe92fb0913910c44c1864e05e8a808cb185934d406b925f352ef'
-  data.tar.gz: 489ed88413acf04675b2e1b41f123e53a96fc6dac55e7b762a24163f37f694f746ece6a1edd144ae084b0b40bcd091ffb2a0085a684174491adeeb966924833c
+  metadata.gz: f686fd92b5118df058d1cfb25ab3c21496e6b31d0271de5173be08d7d4731b80a13f22d103af39e57f0ba2c24a84810bd2adc3df147ca6f02cce5ff1bfb0267b
+  data.tar.gz: 78744edba395438dbd76f94c68b1cdcacb5896e4f509e302267df5654ad5ef87356ef65cf17be9e0da594fed1d72dc7408c12428581ccc18fe7ec8870dfb6c57

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.logger.class.to_s == 'Ougai::Logger'
+        Rails.logger.with_fields = { trace_id: SecureRandom.uuid, name: "RailsWorker"} if Rails.logger.class.to_s == 'Ougai::Logger' && ZuoraConnect.configuration.json_logging
         case args.class.to_s
         when "Array"
           if args.first.class == Hash

data/lib/zuora_connect.rb

@@ -31,24 +31,43 @@ module ZuoraConnect
       #puts name + ' - ' + {Logger::WARN => 'Logger::WARN', Logger::ERROR => 'Logger::ERROR', Logger::DEBUG => 'Logger::DEBUG', Logger::INFO => 'Logger::INFO' }[level] + ' - '
       if type == :ougai
         require 'ougai'
+        require "ougai/formatters/customizable"
         #logger = Ougai::Logger.new(MonoLogger.new(STDOUT))
         logger = Ougai::Logger.new(STDOUT) 
-        logger.formatter = Ougai::Formatters::ConnectFormatter.new(name)
         logger.level = level
-        logger.before_log = lambda do |data|
-          data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
-          data[:zuora_trace_id] = ZuoraConnect::RequestIdMiddleware.zuora_request_id if ZuoraConnect::RequestIdMiddleware.zuora_request_id.present?
-          #data[:traces] = {amazon_id: data[:trace_id], zuora_id: data[:zuora_trace_id]}
-          if !['ElasticAPM', 'ResqueScheduler', 'ResquePool', 'Resque', 'Makara'].include?(name) 
-            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?
+        if ZuoraConnect.configuration.json_logging
+          logger.formatter = Ougai::Formatters::ConnectFormatter.new(name)
+          logger.before_log = lambda do |data|
+            data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
+            data[:zuora_trace_id] = ZuoraConnect::RequestIdMiddleware.zuora_request_id if ZuoraConnect::RequestIdMiddleware.zuora_request_id.present?
+            #data[:traces] = {amazon_id: data[:trace_id], zuora_id: data[:zuora_trace_id]}
+            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool', 'Resque', 'Makara'].include?(name) 
+              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
           end
+        else
+          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
+          )
+          logger.formatter.datetime_format = '%FT%T.%6NZ'
         end
       else
         logger = MonoLogger.new(STDOUT)
@@ -58,26 +77,29 @@ module ZuoraConnect
             msg = JSON.parse(msg)
           rescue JSON::ParserError => ex
           end
-
-          require 'json'
-          store = {
-            name: name,
-            level: serverity,
-            timestamp: datetime.strftime('%FT%T.%6NZ'),
-            pid: Process.pid,
-            message: name == "ActionMailer" ? msg.strip : msg
-          }
-          if !['ElasticAPM', 'ResqueScheduler', 'ResquePool','Resque', 'Makara'].include?(name) 
-            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?
+          if ZuoraConnect.configuration.json_logging
+            require 'json'
+            store = {
+              name: name,
+              level: serverity,
+              timestamp: datetime.strftime('%FT%T.%6NZ'),
+              pid: Process.pid,
+              message: name == "ActionMailer" ? msg.strip : msg
+            }
+            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool','Resque', 'Makara'].include?(name) 
+              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
             end
+            JSON.dump(store) + "\n"
+          else
+            format('%s %s: %s', serverity.ljust(6), datetime, msg) + "\n"
           end
-          JSON.dump(store) + "\n"
         end
       end
       return logger

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
+    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
 
     def initialize
       @default_locale = :en
@@ -42,6 +42,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
     end
 
     def private_key

data/lib/zuora_connect/railtie.rb

@@ -32,31 +32,11 @@ module ZuoraConnect
 
     initializer(:rails_stdout_logging, before: :initialize_logger) do
       require 'lograge'
-      require "ougai"
-      require "ougai/formatters/customizable"
+      
       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

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5x"
+  VERSION = "2.0.5y"
 end

metadata

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