Merge pull request reidmorrison#177 from madejejej/run-to-unsafe-h-only-on-ac-params

Skip ActionController if payload[:params] is not a Hash

Author: reidmorrison

lib/rails_semantic_logger/action_controller/log_subscriber.rb

@@ -14,12 +14,22 @@ def process_action(event)
 
           # Unused, but needed for Devise 401 status code monkey patch to still work.
           ::ActionController::Base.log_process_action(payload)
+          
+          params = payload[:params]
 
-          # According to PR https://github.com/reidmorrison/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)
-          payload[:params] = payload[:params].except(*INTERNAL_PARAMS)
-          payload.delete(:params) if payload[:params].empty?
+          if params.kind_of?(Hash) || params.kind_of?(::ActionController::Parameters)
+            # According to PR https://github.com/reidmorrison/rails_semantic_logger/pull/37/files
+            # params is not always a Hash.
+            payload[:params] = params.to_unsafe_h unless params.is_a?(Hash)
+            payload[:params] = params.except(*INTERNAL_PARAMS)
+
+            if payload[:params].empty?
+              payload.delete(:params)
+            elsif params["file"]
+              # When logging to JSON the entire tempfile is logged, so convert it to a string.
+              payload[:params]["file"] = params["file"].inspect
+            end
+          end
 
           format           = payload[:format]
           payload[:format] = format.to_s.upcase if format.is_a?(Symbol)
@@ -48,12 +58,6 @@ def process_action(event)
           payload.delete(:request)
           payload.delete(:response)
 
-          params = payload[:params]
-          if params
-            # When logging to JSON the entire tempfile is logged, so convert it to a string.
-            params["file"] = params["file"].inspect if params["file"]
-          end
-
           {
             message:  "Completed ##{payload[:action]}",
             duration: event.duration,

test/action_controller_test.rb

@@ -0,0 +1,27 @@
+require_relative "test_helper"
+
+class ActionControllerTest < Minitest::Test
+  describe "RailsSemanticLogger::ActionController::LogSubscriber" do
+    let(:subscriber) { RailsSemanticLogger::ActionController::LogSubscriber.new }
+
+    describe "#process_action" do
+      it "does not fail if params is not a Hash nor an instance of ActionController::Parameters" do
+        event = ActiveSupport::Notifications::Event.new(
+          "start_processing.action_controller",
+          5.seconds.ago,
+          Time.zone.now,
+          SecureRandom.uuid,
+          {
+            payload: "{}"
+          }
+        )
+
+        messages = semantic_logger_events do
+          subscriber.process_action(event)
+        end
+
+        assert_equal 1, messages.count, messages
+      end
+    end
+  end
+end