Ensure task_context is never nil when error_handler is called #1059
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
| @@ -182,7 +182,7 @@ def on_error(error) | |||
| end | |||
| errored_element = @errored_element if defined?(@errored_element) | |||
| ensure | |||
| MaintenanceTasks.error_handler.call(error, task_context, errored_element) | |||
| MaintenanceTasks.error_handler.call(error, task_context || {}, errored_element) | |||
There was a problem hiding this comment.
What do you think about assigning task_context = {} at the start of this method instead? That would let us drop the else branch above as well.
def on_error(error)
task_context = {}
@ticker.persist if defined?(@ticker)
if defined?(@run)
...
task_context = { ... }
end
...
ensure
MaintenanceTasks.error_handler.call(error, task_context, errored_element)
endThere was a problem hiding this comment.
Good idea, that makes it much cleaner 👍
There was a problem hiding this comment.
Can you squash your commits please @yjukaku and I'll merge ?
yjukaku
force-pushed
the
yjukaku-fix-nil-task-context
branch
from
a2c0137 to
fdc52ad
Compare
|
@adrianna-chang-shopify Done! |
adrianna-chang-shopify
approved these changes
Aug 29, 2024
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.
If
@run.persist_error(error)raises an error,task_contextis never assigned and then isnilwhenMaintenanceTasks.error_handleriscalled.