Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Exception#detailed_message to show backtrace #1952

Merged
merged 2 commits into from
Oct 18, 2023
Merged

Use Exception#detailed_message to show backtrace #1952

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5a4b28
Use Exception#detailed_message to show backtrace
mame Oct 13, 2023
0721b2a
Use `String#lines(chomp: true)`
mame Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion lib/sinatra/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,19 @@ def error_block!(key, *block_params)
end

def dump_errors!(boom)
msg = ["#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} - #{boom.class} - #{boom.message}:", *boom.backtrace].join("\n\t")
if boom.respond_to?(:detailed_message)
msg = boom.detailed_message(highlight: false)
if msg =~ /\A(.*?)(?: \(#{ Regexp.quote(boom.class.to_s) }\))?\n/
msg = $1
additional_msg = $'.lines(chomp: true)
else
additional_msg = []
end
else
msg = boom.message
additional_msg = []
end
msg = ["#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} - #{boom.class} - #{msg}:", *additional_msg, *boom.backtrace].join("\n\t")
@env['rack.errors'].puts(msg)
end

Expand Down