Bladeren bron

job.error\* now return engine.StatusErr

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Victor Vieux 11 jaren geleden
bovenliggende
commit
24086fa75d
2 gewijzigde bestanden met toevoegingen van 125 en 243 verwijderingen
  1. 6 4
      engine/job.go
  2. 119 239
      server.go

+ 6 - 4
engine/job.go

@@ -188,10 +188,12 @@ func (job *Job) Printf(format string, args ...interface{}) (n int, err error) {
 	return fmt.Fprintf(job.Stdout, format, args...)
 	return fmt.Fprintf(job.Stdout, format, args...)
 }
 }
 
 
-func (job *Job) Errorf(format string, args ...interface{}) (n int, err error) {
-	return fmt.Fprintf(job.Stderr, format, args...)
+func (job *Job) Errorf(format string, args ...interface{}) Status {
+	fmt.Fprintf(job.Stderr, format, args...)
+	return StatusErr
 }
 }
 
 
-func (job *Job) Error(err error) (int, error) {
-	return fmt.Fprintf(job.Stderr, "%s", err)
+func (job *Job) Error(err error) Status {
+	fmt.Fprintf(job.Stderr, "%s", err)
+	return StatusErr
 }
 }

File diff suppressed because it is too large
+ 119 - 239
server.go


Some files were not shown because too many files changed in this diff