Fix --timeout flag #569
Merged
Fix --timeout flag #569
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
knqyf263
reviewed
Jul 22, 2020
internal/artifact/run.go
Outdated
Comment on lines
68
to
73
| ctx := context.Background() | ||
| if c.Timeout > 0 { | ||
| var cancel context.CancelFunc | ||
| ctx, cancel = context.WithTimeout(ctx, c.Timeout) | ||
| defer cancel() | ||
| } |
There was a problem hiding this comment.
Timeout has the default value.
Line 155 in 020c4a3
How about the following way?
Suggested change
| ctx := context.Background() | |
| if c.Timeout > 0 { | |
| var cancel context.CancelFunc | |
| ctx, cancel = context.WithTimeout(ctx, c.Timeout) | |
| defer cancel() | |
| } | |
| ctx := context.WithTimeout(context.Background(), c.Timeout) | |
| defer cancel() |
internal/client/run.go
Outdated
Comment on lines
49
to
53
| if c.Timeout > 0 { | ||
| var cancel context.CancelFunc | ||
| ctx, cancel = context.WithTimeout(ctx, c.Timeout) | ||
| defer cancel() | ||
| } |
knqyf263
approved these changes
Jul 22, 2020
liamg
pushed a commit
that referenced
this pull request
Jun 7, 2022
* Wrapped scan call inside context timeout * timeout has default value
josedonizetti
pushed a commit
to josedonizetti/trivy
that referenced
this pull request
Jun 24, 2022
* feat: Add hcl syntax highlighting
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.
Issue