Grape exception handling #1756
Merged
Grape exception handling #1756
+84
−53
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dblock
reviewed
Apr 18, 2018
CHANGELOG.md
Outdated
| @@ -13,6 +13,7 @@ | |||
| * [#1750](https://github.com/ruby-grape/grape/pull/1750): Fix a circular dependency warning due to router being loaded by API - [@salasrod](https://github.com/salasrod). | |||
| * [#1752](https://github.com/ruby-grape/grape/pull/1752): Fix `include_missing` behavior for aliased parameters - [@jonasoberschweiber](https://github.com/jonasoberschweiber). | |||
| * [#1754](https://github.com/ruby-grape/grape/pull/1754): Allow rescue from non-`StandardError` exceptions to use default error handling - [@jelkster](https://github.com/jelkster). | |||
| * [#1756](https://github.com/ruby-grape/grape/pull/1756): Allow custom Grape exception handlers when the build-in exception handling is enabled - [@soylent](https://github.com/soylent). | |||
dblock
reviewed
Apr 18, 2018
lib/grape/middleware/error.rb
Outdated
| @@ -122,16 +85,51 @@ def format_message(message, backtrace, original_exception = nil) | |||
|
|
|||
| private | |||
|
|
|||
| def rescue_all? | |||
| options[:rescue_all] | |||
| DEFAULT_RESCUE_HANDLER = :handle_error | |||
There was a problem hiding this comment.
Seems pretty but maybe unnecessary? I mean :handle_error is already a constant, since this isn't going to change I say copy-paste it everywhere.
There was a problem hiding this comment.
... or maybe even rename it to :default_rescue_handler?
|
Perfect, thanks. See minor comments above. |
Allow custom Grape exception handlers when the built-in exception handling is enabled
|
@dblock All done |
|
Merged, thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request fixes Grape exception handling for the following case:
I reworked
Grape::Middleware::Errora bit:options[:rescue_handlers]andoptions[:base_only_rescue_handlers]only onceoptions[:base_only_rescue_handlers]should have higher priority thanoptions[:rescue_handlers]because it is more restrictive