Skip to content

Fix -clear-cache flag when cache is cleared and improve error handling #176

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 15, 2020
Merged

Fix -clear-cache flag when cache is cleared and improve error handling #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea43e95
Fix -clear-cache flag when cache is cleared and improve error handling
mrnugget Apr 15, 2020
113465e
Use %q instead of single quotes
mrnugget Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cmd/src/actions_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ func (c actionExecutionDiskCache) clear(ctx context.Context, key actionExecution
return err
}

if _, err := os.Stat(path); os.IsNotExist(err) {
return nil
}

return os.Remove(path)
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/src/actions_exec_backend_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ func runAction(ctx context.Context, prefix, repoID, repoName, rev string, steps
elapsed := time.Since(t0).Round(time.Millisecond)
if err != nil {
logger.DockerStepErrored(repoName, i, err, elapsed)
return nil, errors.Wrap(err, "run docker container")
return nil, errors.Wrapf(err, "Running Docker container for image %q failed", step.Image)
}
logger.DockerStepDone(repoName, i, elapsed)

Expand Down
8 changes: 6 additions & 2 deletions cmd/src/actions_exec_logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ func (a *actionLogger) ActionFailed(err error, patches []PatchInput) {
fmt.Fprintln(os.Stderr)
if perr, ok := err.(parallel.Errors); ok {
if len(patches) > 0 {
yellow.Fprintf(os.Stderr, "✗ Action produced %d patches but failed with %d errors.\n\n", len(patches), len(perr))
yellow.Fprintf(os.Stderr, "✗ Action produced %d patches but failed with %d errors:\n\n", len(patches), len(perr))
} else {
yellow.Fprintf(os.Stderr, "✗ Action failed with %d errors.\n", len(perr))
yellow.Fprintf(os.Stderr, "✗ Action failed with %d errors:\n", len(perr))
}
for _, e := range perr {
fmt.Fprintf(os.Stderr, "\t- %s\n", e)
}
fmt.Println()
} else if err != nil {
if len(patches) > 0 {
yellow.Fprintf(os.Stderr, "✗ Action produced %d patches but failed with error: %s\n\n", len(patches), err)
Expand Down