From f67e725e6866f277f706820d4c21b1d0cb2acc80 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 28 Feb 2014 02:40:15 +0000 Subject: [PATCH] remove WARNING writter twice Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) --- server.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server.go b/server.go index b47e1989a8..1771bf0b5f 100644 --- a/server.go +++ b/server.go @@ -1631,11 +1631,11 @@ func (srv *Server) ContainerCreate(job *engine.Job) engine.Status { return job.Errorf("Minimum memory limit allowed is 512k") } if config.Memory > 0 && !srv.runtime.sysInfo.MemoryLimit { - job.Errorf("WARNING: Your kernel does not support memory limit capabilities. Limitation discarded.\n") + job.Errorf("Your kernel does not support memory limit capabilities. Limitation discarded.\n") config.Memory = 0 } if config.Memory > 0 && !srv.runtime.sysInfo.SwapLimit { - job.Errorf("WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.\n") + job.Errorf("Your kernel does not support swap limit capabilities. Limitation discarded.\n") config.MemorySwap = -1 } resolvConf, err := utils.GetResolvConf() @@ -1643,7 +1643,7 @@ func (srv *Server) ContainerCreate(job *engine.Job) engine.Status { return job.Error(err) } if !config.NetworkDisabled && len(config.Dns) == 0 && len(srv.runtime.config.Dns) == 0 && utils.CheckLocalDns(resolvConf) { - job.Errorf("WARNING: Local (127.0.0.1) DNS resolver found in resolv.conf and containers can't use it. Using default external servers : %v\n", defaultDns) + job.Errorf("Local (127.0.0.1) DNS resolver found in resolv.conf and containers can't use it. Using default external servers : %v\n", defaultDns) config.Dns = defaultDns } @@ -1659,7 +1659,7 @@ func (srv *Server) ContainerCreate(job *engine.Job) engine.Status { return job.Error(err) } if !container.Config.NetworkDisabled && srv.runtime.sysInfo.IPv4ForwardingDisabled { - job.Errorf("WARNING: IPv4 forwarding is disabled.\n") + job.Errorf("IPv4 forwarding is disabled.\n") } srv.LogEvent("create", container.ID, srv.runtime.repositories.ImageName(container.Image)) // FIXME: this is necessary because runtime.Create might return a nil container