Added that Dispatcher exceptions should not be shown to the user unless a...

Added that Dispatcher exceptions should not be shown to the user unless a default log has not been configured. Instead show public/500.html [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4168 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

Added that Dispatcher exceptions should not be shown to the user unless a...
Added that Dispatcher exceptions should not be shown to the user unless a default log has not been configured. Instead show public/500.html [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4168 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
11323ceb · David Heinemeier Hansson · 4859b6c0 · 11323ceb · 11323ceb
隐藏空白更改
内联并排

Showing with 22 addition and 2 deletion

railties/CHANGELOG railties/CHANGELOG +2 -0

railties/lib/dispatcher.rb railties/lib/dispatcher.rb +20 -2

未找到文件。
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
 *SVN*

+* Added that Dispatcher exceptions should not be shown to the user unless a default log has not been configured. Instead show public/500.html [DHH]
+
 * Fixed that rake clone_structure_to_test should quit on pgsql if the dump is unsuccesful #4585 [augustz@augustz.com]

 * Fixed that rails --version should have the return code of 0 (success) #4560 [blair@orcaware.com]

--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -90,8 +90,26 @@ def failsafe_response(output, status, exception = nil)
      rescue Object
        begin
          output.write "Status: #{status}\r\n"
-          output.write "Content-Type: text/plain\r\n\r\n"
-          output.write(exception.to_s + "\r\n" + exception.backtrace.join("\r\n")) if exception
+          
+          if exception
+            message    = exception.to_s + "\r\n" + exception.backtrace.join("\r\n")
+            error_path = File.join(RAILS_ROOT, 'public', '500.html')
+
+            if defined?(RAILS_DEFAULT_LOGGER) && !RAILS_DEFAULT_LOGGER.nil?
+              RAILS_DEFAULT_LOGGER.fatal(message)
+
+              output.write "Content-Type: text/html\r\n\r\n"
+
+              if File.exists?(error_path)
+                output.write(IO.read(error_path))
+              else
+                output.write("<html><body><h1>Application error (Rails)</h1></body></html>")
+              end
+            else
+              output.write "Content-Type: text/plain\r\n\r\n"
+              output.write(message)
+            end
+          end
        rescue Object
        end
      end