-
Notifications
You must be signed in to change notification settings - Fork 25
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.
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
Add filename to error message #151
Merged
mjgiarlo
merged 2 commits into
active_encode_dev_con
from
add_filename_to_error_message
Apr 11, 2017
+15
−14
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,24 @@ | ||
require 'active_encode' | ||
|
||
module Hydra::Derivatives::Processors | ||
class ActiveEncodeError < StandardError | ||
def initialize(status, source_path, errors = []) | ||
msg = "ActiveEncode status was \"#{status}\" for #{source_path}" | ||
msg = "#{msg}: #{errors.join(' ; ')}" unless errors.empty? | ||
super(msg) | ||
end | ||
end | ||
|
||
class ActiveEncode < Processor | ||
def process | ||
encode = ::ActiveEncode::Base.create(source_path, directives) | ||
|
||
# Wait until the encoding job is finished | ||
# while(encode.reload.running?) { sleep 10 } | ||
|
||
raise_exception_if_encoding_failed(encode) | ||
raise_exception_if_encoding_cancelled(encode) | ||
raise ActiveEncodeError.new(encode.state, source_path, encode.errors) unless encode.completed? | ||
|
||
# TODO: call output_file_service with the output url | ||
end | ||
|
||
def raise_exception_if_encoding_failed(encode) | ||
return unless encode.failed? | ||
raise StandardError.new("Encoding failed: #{encode.errors.join(' ; ')}") | ||
end | ||
|
||
def raise_exception_if_encoding_cancelled(encode) | ||
return unless encode.cancelled? | ||
raise StandardError.new("Encoding cancelled: #{source_path}") | ||
end | ||
end | ||
end |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will this always throw an error since we're not blocking until the job is finished yet? Seems like it will always have a status of :running when it gets to this point.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I know, that encoding on line 14 can never work. That isn't the correct method signature, is it? I have code on my other branch that creates the encode differently and waits for it to finish running.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is okay, but maybe we can just forget about that point right now. Assuming the encode job is blocking then I think the unless completed check is correct.