kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #11800 from hqhq/hq_fix_create_issue 

add back job.Errorf
This commit is contained in:
Tibor Vass 2015-03-26 11:12:55 -06:00
parent b9d19fdaef 40ef253ef5
commit 2bbf1987d2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/create.go
View File

@ -4,7 +4,6 @@ import (
"fmt"
"strings"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/graph"
"github.com/docker/docker/image"
@ -31,11 +30,11 @@ func (daemon *Daemon) ContainerCreate(job *engine.Job) error {
return fmt.Errorf("Minimum memory limit allowed is 4MB")
}
if hostConfig.Memory > 0 && !daemon.SystemConfig().MemoryLimit {
log.Printf("Your kernel does not support memory limit capabilities. Limitation discarded.\n")
job.Errorf("Your kernel does not support memory limit capabilities. Limitation discarded.\n")
hostConfig.Memory = 0
}
if hostConfig.Memory > 0 && hostConfig.MemorySwap != -1 && !daemon.SystemConfig().SwapLimit {
log.Printf("Your kernel does not support swap limit capabilities. Limitation discarded.\n")
job.Errorf("Your kernel does not support swap limit capabilities. Limitation discarded.\n")
hostConfig.MemorySwap = -1
}
if hostConfig.Memory > 0 && hostConfig.MemorySwap > 0 && hostConfig.MemorySwap < hostConfig.Memory {
@ -57,14 +56,14 @@ func (daemon *Daemon) ContainerCreate(job *engine.Job) error {
return err
}
if !container.Config.NetworkDisabled && daemon.SystemConfig().IPv4ForwardingDisabled {
log.Printf("IPv4 forwarding is disabled.\n")
job.Errorf("IPv4 forwarding is disabled.\n")
}
container.LogEvent("create")
job.Printf("%s\n", container.ID)
for _, warning := range buildWarnings {
log.Printf("%s\n", warning)
job.Errorf("%s\n", warning)
}
return nil

4
engine/job.go
View File

@ -204,6 +204,10 @@ func (job *Job) Printf(format string, args ...interface{}) (n int, err error) {
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) SetCloseIO(val bool) {
job.closeIO = val
}