diff options
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/action_controller/session/active_record_store.rb | 15 |
2 files changed, 1 insertions, 15 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 316490736b..5a169f8916 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -846,6 +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 " Parameters: #{@params.inspect}" end diff --git a/actionpack/lib/action_controller/session/active_record_store.rb b/actionpack/lib/action_controller/session/active_record_store.rb index 321127495e..7642320747 100644 --- a/actionpack/lib/action_controller/session/active_record_store.rb +++ b/actionpack/lib/action_controller/session/active_record_store.rb @@ -279,9 +279,6 @@ class CGI end @session = @@session_class.new(:session_id => session_id, :data => {}) @session.save - logger.debug "opened new session #{@session.session_id}" if logger - else - logger.debug "reopened session #{@session.session_id}" if logger end end @@ -293,42 +290,30 @@ class CGI # Restore session state. The session model handles unmarshaling. def restore if @session - logger.debug "restore session #{@session.session_id}" if logger @session.data - else - logger.debug "skipped restore nil session" if logger end end # Save session store. def update if @session - logger.debug "update session #{@session.session_id}" if logger ActiveRecord::Base.silence { @session.save } - else - logger.debug "skipped update nil session" if logger end end # Save and close the session store. def close if @session - logger.debug "close session #{@session.session_id}" if logger update @session = nil - else - logger.debug "skipped close nil session" if logger end end # Delete and close the session store. def delete if @session - logger.debug "delete session #{@session.session_id}" if logger ActiveRecord::Base.silence { @session.destroy } @session = nil - else - logger.debug "skipped delete nil session" if logger end end |