docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Engine: cleanly log the start and end of each engine job

This commit is contained in:
Solomon Hykes 2013-10-26 17:17:45 -07:00
parent 464ded79fc
commit e8491ae54c
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engine/job.go
View File

@ -5,6 +5,7 @@ import (
"strings" "strings"
"fmt" "fmt"
"encoding/json" "encoding/json"
"github.com/dotcloud/docker/utils"
) )
// A job is the fundamental unit of work in the docker engine. // A job is the fundamental unit of work in the docker engine.
@ -36,17 +37,24 @@ type Job struct {
// If the job returns a failure status, an error is returned // If the job returns a failure status, an error is returned
// which includes the status. // which includes the status.
func (job *Job) Run() error { func (job *Job) Run() error {
randId := utils.RandomString()[:4]
fmt.Printf("Job #%s: %s\n", randId, job)
defer fmt.Printf("Job #%s: %s = '%s'", randId, job, job.status)
if job.handler == nil { if job.handler == nil {
return fmt.Errorf("Undefined job handler") job.status = "command not found"
} else {
job.status = job.handler(job)
} }
status := job.handler(job) if job.status != "0" {
job.status = status return fmt.Errorf("%s: %s", job.Name, job.status)
if status != "0" {
return fmt.Errorf("Job failed with status %s", status)
} }
return nil return nil
} }
// String returns a human-readable description of `job`
func (job *Job) String() string {
return strings.Join(append([]string{job.Name}, job.Args...), " ")
}
func (job *Job) Getenv(key string) (value string) { func (job *Job) Getenv(key string) (value string) {
for _, kv := range job.env { for _, kv := range job.env {