kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

add back job.Errorf

Browse source 
c79b9bab54 (Remove engine.Status and replace it with standard go error)
cause a regression that create container won't get any warnings, we still
need this to send useful informations to user.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
This commit is contained in:
Qiang Huang 2015-03-26 13:12:36 +08:00
parent f84086be2a
commit 40ef253ef5
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" "fmt"
"strings" "strings"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine" "github.com/docker/docker/engine"
"github.com/docker/docker/graph" "github.com/docker/docker/graph"
"github.com/docker/docker/image" "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") return fmt.Errorf("Minimum memory limit allowed is 4MB")
} }
if hostConfig.Memory > 0 && !daemon.SystemConfig().MemoryLimit { 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 hostConfig.Memory = 0
} }
if hostConfig.Memory > 0 && hostConfig.MemorySwap != -1 && !daemon.SystemConfig().SwapLimit { 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 hostConfig.MemorySwap = -1
} }
if hostConfig.Memory > 0 && hostConfig.MemorySwap > 0 && hostConfig.MemorySwap < hostConfig.Memory { 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 return err
} }
if !container.Config.NetworkDisabled && daemon.SystemConfig().IPv4ForwardingDisabled { if !container.Config.NetworkDisabled && daemon.SystemConfig().IPv4ForwardingDisabled {
log.Printf("IPv4 forwarding is disabled.\n") job.Errorf("IPv4 forwarding is disabled.\n")
} }
container.LogEvent("create") container.LogEvent("create")
job.Printf("%s\n", container.ID) job.Printf("%s\n", container.ID)
for _, warning := range buildWarnings { for _, warning := range buildWarnings {
log.Printf("%s\n", warning) job.Errorf("%s\n", warning)
} }
return nil 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...) 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) { func (job *Job) SetCloseIO(val bool) {
job.closeIO = val job.closeIO = val
} }