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

2 files changed, 7 insertions, 1 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index a62b19fcc7..9b977f1377 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *2.2.1 [RC2 or 2.2 final]*
 
+* 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]
 
 * Fixed bug with asset timestamping when using relative_url_root #1265 [Joe Goldwasser]
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 380f6bbf7a..b00cfda042 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1226,7 +1226,11 @@ module ActionController #:nodoc:
       def log_processing
         if logger && logger.info?
           logger.info "\n\nProcessing #{self.class.name}\##{action_name} (for #{request_origin}) [#{request.method.to_s.upcase}]"
-          logger.info "  Session ID: #{@_session.session_id}" if @_session and @_session.respond_to?(:session_id)
+
+          if @_session && @_session.respond_to?(:session_id) && !@_session.dbman.is_a?(CGI::Session::CookieStore)
+            logger.info "  Session ID: #{@_session.session_id}"
+          end
+
           logger.info "  Parameters: #{respond_to?(:filter_parameters) ? filter_parameters(params).inspect : params.inspect}"
         end
       end