public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Simplified the logging format for parameters (don't include controller, action, 
and format as duplicates) [DHH]
dhh (author)
Sat Nov 01 07:46:30 -0700 2008
commit  62ffc6e4db1eecfe5c5a5f7471a9c39d665ada56
tree    0e8f8cabcb0ddf66be58fa3a4697b303128de0ea
parent  fbe387ea257ffbbf8689f333512aa7ef0628f3d2
...
1
2
 
 
3
4
5
...
1
2
3
4
5
6
7
0
@@ -1,5 +1,7 @@
0
 *2.2.1 [RC2 or 2.2 final]*
0
 
0
+* Simplified the logging format for parameters (don't include controller, action, and format as duplicates) [DHH]
0
+
0
 * Remove the logging of the Session ID when the session store is CookieStore [DHH]
0
 
0
 * Fixed regex in redirect_to to fully support URI schemes #1247 [Seth Fitzsimmons]
...
1225
1226
1227
1228
 
 
 
 
 
 
 
 
 
 
1229
1230
1231
1232
1233
 
 
1234
1235
 
 
 
 
1236
1237
1238
 
 
 
 
 
 
 
1239
1240
1241
...
1225
1226
1227
 
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
 
 
 
 
1239
1240
1241
 
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
0
@@ -1225,17 +1225,34 @@ module ActionController #:nodoc:
0
 
0
       def log_processing
0
         if logger && logger.info?
0
-          logger.info "\n\nProcessing #{self.class.name}\##{action_name} (for #{request_origin}) [#{request.method.to_s.upcase}]"
0
+          log_processing_for_request_id
0
+          log_processing_for_session_id
0
+          log_processing_for_parameters
0
+        end
0
+      end
0
+      
0
+      def log_processing_for_request_id
0
+        request_id = "\n\nProcessing #{self.class.name}\##{action_name} "
0
+        request_id << "to #{params[:format]} " if params[:format]
0
+        request_id << "(for #{request_origin}) [#{request.method.to_s.upcase}]"
0
 
0
-          if @_session && @_session.respond_to?(:session_id) &&
0
-              !(@_session.respond_to?(:dbman) && @_session.is_a?(CGI::Session::CookieStore))
0
-            logger.info "  Session ID: #{@_session.session_id}"
0
-          end
0
+        logger.info(request_id)
0
+      end
0
 
0
-          logger.info "  Parameters: #{respond_to?(:filter_parameters) ? filter_parameters(params).inspect : params.inspect}"
0
+      def log_processing_for_session_id
0
+        if @_session && @_session.respond_to?(:session_id) && @_session.respond_to?(:dbman) &&
0
+            !@_session.dbman.is_a?(CGI::Session::CookieStore)
0
+          logger.info "  Session ID: #{@_session.session_id}"
0
         end
0
       end
0
 
0
+      def log_processing_for_parameters
0
+        parameters = respond_to?(:filter_parameters) ? filter_parameters(params) : params
0
+        parameters = parameters.except(:controller, :action, :format)
0
+        
0
+        logger.info "  Parameters: #{parameters.inspect}"
0
+      end
0
+
0
       def default_render #:nodoc:
0
         render
0
       end

Comments