getaround_utils 0.2.1 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 981f0875cde80a2864fa581ff701fae135cacbf2be760e89d8f6b7988451abb4
-  data.tar.gz: 0662d06f13cab178022780240da55ca6731e1cc09441252844b7722418897514
+  metadata.gz: 9417adfbf154de067fbed11a70e5b6681c7faa5366a6079385343c398718ba62
+  data.tar.gz: '018b38e0d6e4a0089af15dc11ce6b5a66b4864d30b347ae9cb00fcb75e24260e'
 SHA512:
-  metadata.gz: 8dd91848e31add43da0d7185a0cad460527709c01235c1dd456ee74b53f64ddeec350c6f6e673fe1d678019ab799bf71d5521e966d56de63eeb06b5c20807f0c
-  data.tar.gz: 5c65f77887e904be78eb1348f3380174bcc65582e916db1ff79e800296630252b1403bfe8a5ecd4a58b2cbc091d0626cf2d1d665dd015b836fb1d2693868ce88
+  metadata.gz: 83935ef72c8c6a36d37453a76e3dae0638e4cb7ef616038c9c052108abfac506eaf30af373edc5141ca4242a59db0b1133454870ce0f94273186ce27cea8ddbc
+  data.tar.gz: ec0717e5549bdb6eced7c937abe9532e732b4cc8a944fbe1daa48bab2b1b3cd220026475d469c0138a67b61c1754a14b3e5add22dbf2ec60cdb9303b72da18ca

data/Gemfile.lock

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

data/lib/getaround_utils/mixins/loggable.rb

@@ -14,26 +14,16 @@ module GetaroundUtils::Mixins::Loggable
     append_infos_to_loggable(payload)
   end
 
-  def base_loggable_logger
-    @base_loggable_logger ||= if respond_to?(:logger) && !logger.nil?
-      logger
-    elsif defined?(Rails)
-      Rails.logger
-    else
-      Logger.new(STDOUT)
-    end
+  def loggable_logger_fallback
+    @loggable_logger_fallback ||= Logger.new(STDOUT)
   end
 
-  def loggable(severity, message, payload = {})
-    base_loggable_logger.send(
-      :warn,
-      "Deprecated usage of GetaroundUtils::Mixins::Loggable#loggable(*args). Please use GetaroundUtils::Mixins::Loggable#loggable_log(*args) instead"
-    )
-    loggable_log(severity, message, payload)
+  def loggable_logger
+    (logger if respond_to?(:logger)) || (Rails.logger if defined?(Rails)) || loggable_logger_fallback
   end
 
   def loggable_log(severity, message, payload = {})
     base_append_infos_to_loggable(payload)
-    base_loggable_logger.send(severity.to_sym, message, payload)
+    loggable_logger.send(severity.to_sym, msg: message, **payload)
   end
 end

data/lib/getaround_utils/ougai/deep_key_value_formatter.rb

@@ -6,12 +6,12 @@ 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)
     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

@@ -8,9 +8,10 @@ module GetaroundUtils::Ougai; end
 class GetaroundUtils::Ougai::JsonFormatter < Ougai::Formatters::Base
   def _call(severity, _time, progname, data)
     message = data.delete(:msg)
-    data[:message] = message if message != 'No message'
+    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.1'.freeze
+  VERSION = '0.2.10'.freeze
 end

metadata

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