mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Avoid returning a constant in ActionDispatch::ShowExceptions
This commit is contained in:
parent
6e9304a05d
commit
326d88660f
1 changed files with 7 additions and 8 deletions
|
@ -14,14 +14,8 @@ module ActionDispatch
|
||||||
# If the application returns a "X-Cascade" pass response, this middleware
|
# If the application returns a "X-Cascade" pass response, this middleware
|
||||||
# will send an empty response as result with the correct status code.
|
# will send an empty response as result with the correct status code.
|
||||||
# If any exception happens inside the exceptions app, this middleware
|
# If any exception happens inside the exceptions app, this middleware
|
||||||
# catches the exceptions and returns a FAILSAFE_RESPONSE.
|
# catches the exceptions and returns a failsafe response.
|
||||||
class ShowExceptions
|
class ShowExceptions
|
||||||
FAILSAFE_RESPONSE = [500, { "Content-Type" => "text/plain" },
|
|
||||||
["500 Internal Server Error\n" \
|
|
||||||
"If you are the administrator of this website, then please read this web " \
|
|
||||||
"application's log file and/or the web server's log file to find out what " \
|
|
||||||
"went wrong."]]
|
|
||||||
|
|
||||||
def initialize(app, exceptions_app)
|
def initialize(app, exceptions_app)
|
||||||
@app = app
|
@app = app
|
||||||
@exceptions_app = exceptions_app
|
@exceptions_app = exceptions_app
|
||||||
|
@ -52,7 +46,12 @@ module ActionDispatch
|
||||||
response[1]["X-Cascade"] == "pass" ? pass_response(status) : response
|
response[1]["X-Cascade"] == "pass" ? pass_response(status) : response
|
||||||
rescue Exception => failsafe_error
|
rescue Exception => failsafe_error
|
||||||
$stderr.puts "Error during failsafe response: #{failsafe_error}\n #{failsafe_error.backtrace * "\n "}"
|
$stderr.puts "Error during failsafe response: #{failsafe_error}\n #{failsafe_error.backtrace * "\n "}"
|
||||||
FAILSAFE_RESPONSE
|
|
||||||
|
[500, { "Content-Type" => "text/plain" },
|
||||||
|
["500 Internal Server Error\n" \
|
||||||
|
"If you are the administrator of this website, then please read this web " \
|
||||||
|
"application's log file and/or the web server's log file to find out what " \
|
||||||
|
"went wrong."]]
|
||||||
end
|
end
|
||||||
|
|
||||||
def pass_response(status)
|
def pass_response(status)
|
||||||
|
|
Loading…
Reference in a new issue