From 373bc86d2d8bb49bd4dbef1256207f52c8dcb0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=BCtke?= Date: Thu, 22 Dec 2005 21:16:11 +0000 Subject: 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 --- actionpack/lib/action_controller/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/base.rb') 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 -- cgit v1.2.3