toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4312 from shykes/engine-error-reporting

Browse Source 
Engine: clearer job error reporting
Upstream-commit: 4a4915c8eef8d49f9d68a85f01435301a203acb4
Component: engine
This commit is contained in:
Victor Vieux
2014-02-24 13:58:12 -08:00
parent f1336c7e0c e69a84baec
commit 102c3daac9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/engine/job.go
+5 -2
View File
@@ -74,7 +74,7 @@ func (job *Job) Run() error {
return err
}
if job.status != 0 {
return fmt.Errorf("%s: %s", job.Name, errorMessage)
return fmt.Errorf("%s", errorMessage)
}
return nil
}
@@ -201,11 +201,14 @@ func (job *Job) Printf(format string, args ...interface{}) (n int, err error) {
}
func (job *Job) Errorf(format string, args ...interface{}) Status {
if format[len(format)-1] != '\n' {
format = format + "\n"
}
fmt.Fprintf(job.Stderr, format, args...)
return StatusErr
}
func (job *Job) Error(err error) Status {
fmt.Fprintf(job.Stderr, "%s", err)
fmt.Fprintf(job.Stderr, "%s\n", err)
return StatusErr
}