Make filter parameters based on request, so they can be modified for anything in the middleware stack.

2 files changed, 10 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index cf66e99fa5..a66aafd80e 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -74,8 +74,12 @@ module ActionController
     end
 
     # This method has been moved to ActionDispatch::Request.filter_parameters
-    def self.filter_parameter_logging(*)
+    def self.filter_parameter_logging(*args, &block)
       ActiveSupport::Deprecation.warn("Setting filter_parameter_logging in ActionController is deprecated and has no longer effect, please set 'config.filter_parameters' in config/application.rb instead", caller)
+      filter = Rails.application.config.filter_parameters
+      filter.concat(args)
+      filter << block if block
+      filter
     end
 
     def _normalize_options(action=nil, options={}, &blk)
diff --git a/actionpack/lib/action_controller/railties/subscriber.rb b/actionpack/lib/action_controller/railties/subscriber.rb
index d257d6ac2c..1f0e6bf51a 100644
--- a/actionpack/lib/action_controller/railties/subscriber.rb
+++ b/actionpack/lib/action_controller/railties/subscriber.rb
@@ -1,10 +1,14 @@
 module ActionController
   module Railties
     class Subscriber < Rails::Subscriber
+      INTERNAL_PARAMS = %w(controller action format _method only_path)
+
       def start_processing(event)
         payload = event.payload
+        params  = payload[:params].except(*INTERNAL_PARAMS)
+
         info "  Processing by #{payload[:controller]}##{payload[:action]} as #{payload[:formats].first.to_s.upcase}"
-        info "  Parameters: #{payload[:params].inspect}" unless payload[:params].blank?
+        info "  Parameters: #{params.inspect}" unless params.empty?
       end
 
       def process_action(event)