Skip to content

Commit

Permalink
Simplified the logging format for parameters (don't include controlle…
Browse files Browse the repository at this point in the history
…r, action, and format as duplicates) [DHH]
  • Loading branch information
dhh committed Nov 1, 2008
1 parent fbe387e commit 62ffc6e
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 6 deletions.
2 changes: 2 additions & 0 deletions actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*2.2.1 [RC2 or 2.2 final]*

* Simplified the logging format for parameters (don't include controller, action, and format as duplicates) [DHH]

* Remove the logging of the Session ID when the session store is CookieStore [DHH]

* Fixed regex in redirect_to to fully support URI schemes #1247 [Seth Fitzsimmons]
Expand Down
29 changes: 23 additions & 6 deletions actionpack/lib/action_controller/base.rb
Expand Up @@ -1225,17 +1225,34 @@ def initialize_current_url

def log_processing
if logger && logger.info?
logger.info "\n\nProcessing #{self.class.name}\##{action_name} (for #{request_origin}) [#{request.method.to_s.upcase}]"
log_processing_for_request_id
log_processing_for_session_id
log_processing_for_parameters
end
end

def log_processing_for_request_id
request_id = "\n\nProcessing #{self.class.name}\##{action_name} "
request_id << "to #{params[:format]} " if params[:format]
request_id << "(for #{request_origin}) [#{request.method.to_s.upcase}]"

if @_session && @_session.respond_to?(:session_id) &&
!(@_session.respond_to?(:dbman) && @_session.is_a?(CGI::Session::CookieStore))
logger.info " Session ID: #{@_session.session_id}"
end
logger.info(request_id)
end

logger.info " Parameters: #{respond_to?(:filter_parameters) ? filter_parameters(params).inspect : params.inspect}"
def log_processing_for_session_id
if @_session && @_session.respond_to?(:session_id) && @_session.respond_to?(:dbman) &&
!@_session.dbman.is_a?(CGI::Session::CookieStore)
logger.info " Session ID: #{@_session.session_id}"
end
end

def log_processing_for_parameters
parameters = respond_to?(:filter_parameters) ? filter_parameters(params) : params
parameters = parameters.except(:controller, :action, :format)

logger.info " Parameters: #{parameters.inspect}"
end

def default_render #:nodoc:
render
end
Expand Down

0 comments on commit 62ffc6e

Please sign in to comment.