getaround_utils 0.2.0 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdcc5b1460329ad345ef3d8a3be543c4e4d9b5b626d4c71551c698513df16a97
-  data.tar.gz: 876b086f9f1ef2b411409ffcfd5f2d16676fed5fa87d40020f254efc3e2d9b7c
+  metadata.gz: c42ef677431ceda95a517423c02274ee8a3972f374be40743f519bb3ab3f6c11
+  data.tar.gz: f695fe8fd906c44ebf894c22990913077b66b5def97ff14c6ec8084c40fa982a
 SHA512:
-  metadata.gz: 42967aa90f0c6384d87d9b1c1d7fde77526b3949a854107b438c9968524736df6e6b044dd8674d92c6d53e36e4c3024debbbc1ef799fcea62a034ad7a733e94d
-  data.tar.gz: c23299cce88fd8bf7ecc9741ddda44e3a14d7e68b2f06fe359fcac88d635a91513c4dfe930437e65054ea30363b07d3aa52d84e7f10a09932d705ba250c120f1
+  metadata.gz: '029d3cdfbd61b334ad96898377cae44b13244409f92022138cc832168dff1bc7dd94415d1a5a02760f7498f8a7eac0c502413645900e5b3873f20e49033203cc'
+  data.tar.gz: 1313d197fc287364b9b3a28e90607873ac8e7d3450b173d5cea607a64a01160e971894136f40ca1e28d6fb75c8bc8db41b731fb4d8d3b11f9e978d668d25989a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    getaround_utils (0.2.0)
+    getaround_utils (0.2.9)
 
 GEM
   remote: https://rubygems.org/

data/lib/getaround_utils/mixins/loggable.rb

@@ -34,6 +34,6 @@ module GetaroundUtils::Mixins::Loggable
 
   def loggable_log(severity, message, payload = {})
     base_append_infos_to_loggable(payload)
-    base_loggable_logger.send(severity.to_sym, message, payload)
+    base_loggable_logger.send(severity.to_sym, msg: message, **payload)
   end
 end

data/lib/getaround_utils/ougai/deep_key_value_formatter.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'ougai'
 require 'getaround_utils/utils/deep_key_value'
 
 module GetaroundUtils; end
 module GetaroundUtils::Ougai; end
 
-class GetaroundUtils::Ougai::DeepKeyValuesFormatter < Ougai::Formatters::Base
+class GetaroundUtils::Ougai::DeepKeyValueFormatter < Ougai::Formatters::Base
   def _call(severity, _time, progname, data)
-    data.delete(:msg) if data[:msg] == 'No message'
-    data = data.except(:msg).merge(message: data[:msg])
+    message = data.delete(:msg)
+    data[:message] = message if message != 'No message'
 
-    payload = { severity: severity, progname: progname }.merge(data).compact!
+    payload = { severity: severity, progname: progname }.merge(data).compact
     GetaroundUtils::Utils::DeepKeyValue.serialize(payload) + "\n"
   end
 end

data/lib/getaround_utils/ougai/json_formatter.rb

@@ -7,10 +7,11 @@ module GetaroundUtils::Ougai; end
 
 class GetaroundUtils::Ougai::JsonFormatter < Ougai::Formatters::Base
   def _call(severity, _time, progname, data)
-    data.delete(:msg) if data[:msg] == 'No message'
-    data = data.except(:msg).merge(message: data[:msg])
+    message = data.delete(:msg)
+    data = { caption: message }.merge(data) \
+      unless message == 'No message'
 
-    payload = { severity: severity, progname: progname }.merge(data).compact!
+    payload = { severity: severity, progname: progname }.merge(data).compact
     JSON.dump(payload) + "\n"
   end
 end

data/lib/getaround_utils/railties/ougai.rb

@@ -19,9 +19,13 @@ end
 # https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger#with-activesupporttaggedlogging
 module OugaiTaggedLoggingFormatter
   def call(severity, time, progname, data)
-    data = { msg: data.to_s } unless data.is_a?(Hash)
-    data[:tags] = current_tags if current_tags.any?
-    _call(severity, time, progname, data)
+    if is_a?(Ougai::Formatters::Base)
+      data = { msg: data.to_s } unless data.is_a?(Hash)
+      data[:tags] = current_tags if current_tags.any?
+      _call(severity, time, progname, data)
+    else
+      super
+    end
   end
 end
 
@@ -40,12 +44,9 @@ class OugaiRequestStoreMiddleware
 end
 
 class GetaroundUtils::Railties::Ougai < Rails::Railtie
-  log_level = ENV.fetch('LOG_LEVEL', :info).to_sym
-
   config.ougai_logger = OugaiRailsLogger.new(STDOUT)
   config.ougai_logger.after_initialize if Rails::VERSION::MAJOR < 6
-  config.ougai_logger.level = log_level
-  config.ougai_logger.formatter = GetaroundUtils::Ougai::DeepKeyValuesFormatter.new
+  config.ougai_logger.formatter = GetaroundUtils::Ougai::DeepKeyValueFormatter.new
   config.ougai_logger.before_log = lambda do |data|
     request_store = RequestStore.store[:ougai] || {}
     data.merge!(request_store) if request_store&.any?
@@ -55,15 +56,6 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
   end
 
   initializer :getaround_utils_ougai, before: :initialize_logger do |app|
-    LOG_LEVELS = {
-      Logger::DEBUG => :debug,
-      Logger::INFO => :info,
-      Logger::WARN => :warn,
-      Logger::ERROR => :error,
-      Logger::FATAL => :fatal,
-    }.freeze
-
-    app.config.log_level = LOG_LEVELS[config.ougai_logger.level] || :info
     app.config.logger = config.ougai_logger
   end
 
@@ -89,7 +81,7 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
     Sidekiq.logger = config.ougai_logger
 
     Sidekiq.configure_server do |config|
-      config.error_handlers.pop
+      config.error_handlers.shift
       config.error_handlers << lambda do |ex, ctx|
         Sidekiq.logger.warn(ex, job: ctx[:job])
       end

data/lib/getaround_utils/version.rb

@@ -1,3 +1,3 @@
 module GetaroundUtils
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getaround_utils
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.9
 platform: ruby
 authors:
 - Drivy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler