aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorTobias Lütke <tobias.luetke@gmail.com>2005-12-22 21:16:11 +0000
committerTobias Lütke <tobias.luetke@gmail.com>2005-12-22 21:16:11 +0000
commit373bc86d2d8bb49bd4dbef1256207f52c8dcb0ac (patch)
treee71541b56ed7195b3721728c00bce8f757e9edff /actionpack/lib/action_controller
parent4e76ae39047b369a192ee1a55cfcb4418c5c1f93 (diff)
downloadrails-373bc86d2d8bb49bd4dbef1256207f52c8dcb0ac.tar.gz
rails-373bc86d2d8bb49bd4dbef1256207f52c8dcb0ac.tar.bz2
rails-373bc86d2d8bb49bd4dbef1256207f52c8dcb0ac.zip
only log session_id if @session object responds to .session_id.
In functional test cases you often pass in a hash as session object which doesn't have this method. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3339 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 5a169f8916..9479b93a96 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -846,7 +846,7 @@ module ActionController #:nodoc:
def log_processing
logger.info "\n\nProcessing #{controller_class_name}\##{action_name} (for #{request_origin}) [#{request.method.to_s.upcase}]"
- logger.info " Session ID: #{@session.session_id}" if @session
+ logger.info " Session ID: #{@session.session_id}" if @session and @session.respond_to?(:session_id)
logger.info " Parameters: #{@params.inspect}"
end