11require " ./base"
2+ require " ../exceptions/page"
23
34module Amber::Controller
45 class Error < Base
@@ -7,49 +8,46 @@ module Amber::Controller
78 @context .response.content_type = content_type
89 end
910
10- def not_found
11- response_format( @ex .message)
11+ def bad_request
12+ response_format
1213 end
1314
14- def internal_server_error
15- response_format( " ERROR: #{ internal_server_error_message } " )
15+ def forbidden
16+ response_format
1617 end
1718
18- def forbidden
19- response_format(@ex .message)
19+ def not_found
20+ response_format
21+ end
22+
23+ def internal_server_error
24+ response_format
2025 end
2126
2227 private def content_type
2328 if context.request.headers[" Accept"
2429 request.headers[" Accept" " ,"
2530 else
26- " text/html "
31+ " text/plain "
2732 end
2833 end
2934
30- private def internal_server_error_message
31- # IMPORTANT: #inspect_with_backtrace will fail in some situations which breaks the tests.
32- # Even if you call @ex.callstack you'll notice that backtrace is nil.
33- # #backtrace? is supposed to be safe but it exceptions anyway.
34- # Please don't remove this without verifying that crystal core has been fixed first.
35- @ex .inspect_with_backtrace
36- rescue ex : IndexError
37- @ex .message
38- rescue ex
39- <<-ERROR
40- Original Error: #{ @ex .message}
41- Error during 'inspect_with_backtrace': #{ ex.message }
42- ERROR
43- end
44-
45- private def response_format (message )
35+ private def response_format
4636 case content_type
4737 when " application/json"
48- {" error"
38+ {" error" @ex . message}.to_json
4939 when " text/html"
50- " <html><body><pre>#{ message } "
40+ html_response
41+ else
42+ @ex .message
43+ end
44+ end
45+
46+ private def html_response
47+ if Amber .env.development?
48+ Amber ::Exceptions ::Page .for_runtime_exception(context, @ex ).to_s
5149 else
52- message
50+ " <html><body><pre> #{ @ex . message} </pre></body></html> "
5351 end
5452 end
5553 end
0 commit comments