Timeout #160
Merged
Timeout #160
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
|
Looks like some merge conflicts were introduced after merging #158 |
|
Rebased |
|
Sorry, one more from merging #162. :) |
shssoichiro
reviewed
Jan 30, 2019
| @@ -341,6 +341,8 @@ pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<( | |||
| eprintln!("Processing: {}", input); | |||
| } | |||
|
|
|||
| let deadline = Arc::new(Deadline::new(opts.timeout, opts.verbosity.is_some())); | |||
There was a problem hiding this comment.
Does it make more sense to instantiate the Deadline (here and on 443) inside optimize_png to avoid the duplication?
There was a problem hiding this comment.
It starts counting time from when it's instantiated, and I wanted it to also include time it takes to load the image.
shssoichiro
approved these changes
Feb 1, 2019
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.
(requires #158)
Short timeouts didn't work well with large images, because the timeout was checked rarely.
This adds more checks of
deadline.passed()