Browse code

add back job.Errorf

c79b9bab54167 (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>

Qiang Huang authored on 2015/03/26 14:12:36
Showing 2 changed files
... ...
@@ -4,7 +4,6 @@ import (
4 4
 	"fmt"
5 5
 	"strings"
6 6
 
7
-	log "github.com/Sirupsen/logrus"
8 7
 	"github.com/docker/docker/engine"
9 8
 	"github.com/docker/docker/graph"
10 9
 	"github.com/docker/docker/image"
... ...
@@ -31,11 +30,11 @@ func (daemon *Daemon) ContainerCreate(job *engine.Job) error {
31 31
 		return fmt.Errorf("Minimum memory limit allowed is 4MB")
32 32
 	}
33 33
 	if hostConfig.Memory > 0 && !daemon.SystemConfig().MemoryLimit {
34
-		log.Printf("Your kernel does not support memory limit capabilities. Limitation discarded.\n")
34
+		job.Errorf("Your kernel does not support memory limit capabilities. Limitation discarded.\n")
35 35
 		hostConfig.Memory = 0
36 36
 	}
37 37
 	if hostConfig.Memory > 0 && hostConfig.MemorySwap != -1 && !daemon.SystemConfig().SwapLimit {
38
-		log.Printf("Your kernel does not support swap limit capabilities. Limitation discarded.\n")
38
+		job.Errorf("Your kernel does not support swap limit capabilities. Limitation discarded.\n")
39 39
 		hostConfig.MemorySwap = -1
40 40
 	}
41 41
 	if hostConfig.Memory > 0 && hostConfig.MemorySwap > 0 && hostConfig.MemorySwap < hostConfig.Memory {
... ...
@@ -57,14 +56,14 @@ func (daemon *Daemon) ContainerCreate(job *engine.Job) error {
57 57
 		return err
58 58
 	}
59 59
 	if !container.Config.NetworkDisabled && daemon.SystemConfig().IPv4ForwardingDisabled {
60
-		log.Printf("IPv4 forwarding is disabled.\n")
60
+		job.Errorf("IPv4 forwarding is disabled.\n")
61 61
 	}
62 62
 	container.LogEvent("create")
63 63
 
64 64
 	job.Printf("%s\n", container.ID)
65 65
 
66 66
 	for _, warning := range buildWarnings {
67
-		log.Printf("%s\n", warning)
67
+		job.Errorf("%s\n", warning)
68 68
 	}
69 69
 
70 70
 	return nil
... ...
@@ -204,6 +204,10 @@ func (job *Job) Printf(format string, args ...interface{}) (n int, err error) {
204 204
 	return fmt.Fprintf(job.Stdout, format, args...)
205 205
 }
206 206
 
207
+func (job *Job) Errorf(format string, args ...interface{}) (n int, err error) {
208
+	return fmt.Fprintf(job.Stderr, format, args...)
209
+}
210
+
207 211
 func (job *Job) SetCloseIO(val bool) {
208 212
 	job.closeIO = val
209 213
 }