rails_semantic_logger 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcc3cb8ba5dd32241b154e8d483caaf8571838dbfb842377d369f7c93e3bacd7
-  data.tar.gz: 251daa71983a8c8098ba05ce759233a897bd1b4f0e018d03b4f01fcdcf81217c
+  metadata.gz: d56fd59e95eb5982a96ce3dd581a3249503c67e83751948648a50c575a357d24
+  data.tar.gz: bbe41e7f698388fd7b14ea3096f62d0316ef51e2ee4fd961f0a5046fe46ad97c
 SHA512:
-  metadata.gz: dae75c826b49e9d2c2233a4c354d54938fb8f17ef63eb5ed27672f886135f5b20bdc177f2a402d5542524f0dbedfc7a9567b8fb04779550c63ecd381462f303f
-  data.tar.gz: b156645f8b0e0357776d9e8ea27037c16e42e54543dac192a46c7c6aeb3cb2bbfd1448e82d1dbfdf30a49f094c74e4a9215a0618906772113593ab9b9dd4b549
+  metadata.gz: fa8f0f7cd9da16e76a3c0803f249710185e1adda00475dc6b4f88605c3893064114f4d7d763a8638ea3dd83e054e42233f2736041b98a259f4f3a12d6df825cc
+  data.tar.gz: 3a025e94a795aabcf96e612eb02ecec265656f5f8939a81908abb48464703693bdd862de6d5a5dc9cd0163b4bdc473d14c534ad2d6ceb2e09f3a4c9cfd210247

data/lib/rails_semantic_logger/engine.rb

@@ -215,6 +215,20 @@ module RailsSemanticLogger
       # Replace the Sidetiq logger
       Sidetiq.logger          = SemanticLogger[Sidetiq] if defined?(Sidetiq)
 
+      # Replace the DelayedJob logger
+      Delayed::Worker.logger = SemanticLogger[Delayed::Worker] if defined?(Delayed::Worker)
+
+      # Replace the Bugsnag logger
+      Bugsnag.configure { |config| config.logger = SemanticLogger[Bugsnag] } if defined?(Bugsnag)
+
+      # Backward compatibility
+      if config.rails_semantic_logger.named_tags
+        config.log_tags = config.rails_semantic_logger.named_tags
+      end
+    end
+
+    # After any initializers run, but after the gems have been loaded
+    config.after_initialize do
       # Replace the Bugsnag logger
       Bugsnag.configure { |config| config.logger = SemanticLogger[Bugsnag] } if defined?(Bugsnag)
 
@@ -243,17 +257,6 @@ module RailsSemanticLogger
       if config.rails_semantic_logger.processing
         require('rails_semantic_logger/extensions/action_controller/log_subscriber_processing') if defined?(ActionView::LogSubscriber)
       end
-
-      # Backward compatibility
-      if config.rails_semantic_logger.named_tags
-        config.log_tags = config.rails_semantic_logger.named_tags
-      end
-    end
-
-    # After any initializers run, but after the gems have been loaded
-    config.after_initialize do
-      # Replace the Bugsnag logger
-      Bugsnag.configure { |config| config.logger = SemanticLogger[Bugsnag] } if defined?(Bugsnag)
     end
 
   end

data/lib/rails_semantic_logger/extensions/action_controller/log_subscriber.rb

@@ -10,7 +10,11 @@ module ActionController
 
     def process_action(event)
       controller_logger(event).info do
-        payload          = event.payload.dup
+        payload = event.payload.dup
+
+        # Unused, but needed for Devise 401 status code patch to still work.
+        ActionController::Base.log_process_action(payload)
+
         # According to PR https://github.com/rocketjob/rails_semantic_logger/pull/37/files
         # payload[:params] is not always a Hash.
         payload[:params] = payload[:params].to_unsafe_h unless payload[:params].is_a?(Hash)
@@ -46,19 +50,19 @@ module ActionController
     end
 
     def halted_callback(event)
-      controller_logger(event).info {"Filter chain halted as #{event.payload[:filter].inspect} rendered or redirected"}
+      controller_logger(event).info { "Filter chain halted as #{event.payload[:filter].inspect} rendered or redirected" }
     end
 
     def send_file(event)
-      controller_logger(event).info('Sent file') {{path: event.payload[:path], duration: event.duration}}
+      controller_logger(event).info('Sent file') { {path: event.payload[:path], duration: event.duration} }
     end
 
     def redirect_to(event)
-      controller_logger(event).info('Redirected to') {{location: event.payload[:location]}}
+      controller_logger(event).info('Redirected to') { {location: event.payload[:location]} }
     end
 
     def send_data(event)
-      controller_logger(event).info('Sent data') {{file_name: event.payload[:filename], duration: event.duration}}
+      controller_logger(event).info('Sent data') { {file_name: event.payload[:filename], duration: event.duration} }
     end
 
     def unpermitted_parameters(event)

data/lib/rails_semantic_logger/extensions/action_controller/log_subscriber_processing.rb

@@ -15,7 +15,7 @@ module ActionController
     def controller_logger(event)
       if controller = event.payload[:controller]
         begin
-          controller.constantize.logger
+          controller.constantize.logger || ActionController::Base.logger
         rescue NameError
           ActionController::Base.logger
         end

data/lib/rails_semantic_logger/extensions/active_record/log_subscriber.rb

@@ -23,39 +23,80 @@ module ActiveRecord
       }
 
       unless (payload[:binds] || []).empty?
-        log_payload[:binds] = binds = {}
-        if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 0 && Rails::VERSION::TINY <= 2 # 5.0.0 - 5.0.2
-          payload[:binds].each do |attr|
-            attr_name, value = render_bind(attr)
-            binds[attr_name] = value
+        log_payload[:binds] =
+          if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 0 && Rails::VERSION::TINY <= 2 # 5.0.0 - 5.0.2
+            bind_values_v5_0_0(payload)
+          elsif Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR <= 1 && (Rails::VERSION::MINOR == 0 || Rails::VERSION::TINY <= 4) # 5.0.3 - 5.1.4
+            bind_values_v5_0_3(payload)
+          elsif Rails::VERSION::MAJOR >= 5 # >= 5.1.5
+            bind_values_v5_1_5(payload)
+          elsif Rails.version.to_i >= 4 # 4.x
+            bind_values_v4(payload)
+          else # 3.x
+            bind_values_v3(payload)
           end
-        elsif Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR <= 1 # 5.0.3 - 5.1.x
-          casted_params = type_casted_binds(payload[:binds], payload[:type_casted_binds])
-          payload[:binds].zip(casted_params).map { |attr, value|
-            render_bind(attr, value)
-          }
-        elsif Rails::VERSION::MAJOR >= 5 # >= 5.2
-          casted_params = type_casted_binds(payload[:type_casted_binds])
-          payload[:binds].zip(casted_params).map do |attr, value|
-            render_bind(attr, value)
-          end
-        elsif Rails.version.to_i >= 4 # 4.x
-          payload[:binds].each do |col, v|
-            attr_name, value = render_bind(col, v)
-            binds[attr_name] = value
-          end
-        else # 3.x
-          payload[:binds].each do |col,v|
-            if col
-              binds[col.name] = v
-            else
-              binds[nil] = v
-            end
-          end
-        end
       end
       debug(log)
     end
 
+    private
+
+    def bind_values_v3(payload)
+      binds = {}
+      payload[:binds].each do |col, v|
+        if col
+          add_bind_value(binds, col.name, v)
+        else
+          binds[nil] = v
+        end
+      end
+      binds
+    end
+
+    def bind_values_v4(payload)
+      binds = {}
+      payload[:binds].each do |col, v|
+        attr_name, value = render_bind(col, v)
+        add_bind_value(binds, attr_name, value)
+      end
+      binds
+    end
+
+    def bind_values_v5_0_0(payload)
+      binds = {}
+      payload[:binds].each do |attr|
+        attr_name, value = render_bind(attr)
+        add_bind_value(binds, attr_name, value)
+      end
+      binds
+    end
+
+    def bind_values_v5_0_3(payload)
+      binds         = {}
+      casted_params = type_casted_binds(payload[:binds], payload[:type_casted_binds])
+      payload[:binds].zip(casted_params).map do |attr, value|
+        attr_name, value = render_bind(attr, value)
+        add_bind_value(binds, attr_name, value)
+      end
+      binds
+    end
+
+    def bind_values_v5_1_5(payload)
+      binds         = {}
+      casted_params = type_casted_binds(payload[:type_casted_binds])
+      payload[:binds].zip(casted_params).map do |attr, value|
+        attr_name, value = render_bind(attr, value)
+        add_bind_value(binds, attr_name, value)
+      end
+      binds
+    end
+
+    # When multiple values are received for a single bound field, it is converted into an array
+    def add_bind_value(binds, key, value)
+      key        = key.downcase.to_sym
+      value      = (Array(binds[key]) << value) if binds.key?(key)
+      binds[key] = value
+    end
+
   end
 end

data/lib/rails_semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module RailsSemanticLogger #:nodoc
-  VERSION = '4.2.0'
+  VERSION = '4.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_semantic_logger
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails