gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-23 07:29:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

feat: show help message when the context's deadline passes (#955)

Browse Source
This commit is contained in:
Teppei Fukuda
2021-04-27 17:13:01 +03:00
committed by GitHub
parent 0346a106f8
commit 1385fa4190
5 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/commands/client/run.go
View File

@@ -18,22 +18,26 @@ import (
)
// Run runs the scan
func Run(cliCtx *cli.Context) error {
c, err := NewConfig(cliCtx)
func Run(ctx *cli.Context) error {
c, err := NewConfig(ctx)
if err != nil {
return err
}
return run(c)
return run(ctx.Context, c)
}
func run(conf Config) error {
func run(ctx context.Context, conf Config) error {
ctx, cancel := context.WithTimeout(context.Background(), conf.Timeout)
defer cancel()
return runWithContext(ctx, conf)
err := runWithTimeout(ctx, conf)
if xerrors.Is(err, context.DeadlineExceeded) {
log.Logger.Warn("Increase --timeout value")
}
return err
}
func runWithContext(ctx context.Context, conf Config) error {
func runWithTimeout(ctx context.Context, conf Config) error {
if err := initialize(&conf); err != nil {
return xerrors.Errorf("initialize error: %w", err)
}