From fcf37be2b1efa11da1958658da0e04755a225c89 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 14 Aug 2014 01:08:27 +0000 Subject: [PATCH] remove double newline Signed-off-by: Victor Vieux --- api/server/server.go | 4 ++-- daemon/container.go | 4 ++-- daemon/daemon.go | 6 +++--- daemon/delete.go | 2 +- daemon/networkdriver/bridge/driver.go | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/server/server.go b/api/server/server.go index 198d2d93f3..96f5bca6a6 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -1036,7 +1036,7 @@ func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, local log.Debugf("Calling %s %s", localMethod, localRoute) if logging { - log.Infof("%s %s\n", r.Method, r.RequestURI) + log.Infof("%s %s", r.Method, r.RequestURI) } if strings.Contains(r.Header.Get("User-Agent"), "Docker-Client/") { @@ -1352,7 +1352,7 @@ func ServeApi(job *engine.Job) engine.Status { return job.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name) } go func() { - log.Infof("Listening for HTTP on %s (%s)\n", protoAddrParts[0], protoAddrParts[1]) + log.Infof("Listening for HTTP on %s (%s)", protoAddrParts[0], protoAddrParts[1]) chErrors <- ListenAndServe(protoAddrParts[0], protoAddrParts[1], job) }() } diff --git a/daemon/container.go b/daemon/container.go index 3cb7af99e3..f359adfe0a 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -946,11 +946,11 @@ func (container *Container) initializeNetworking() error { // Make sure the config is compatible with the current kernel func (container *Container) verifyDaemonSettings() { if container.Config.Memory > 0 && !container.daemon.sysInfo.MemoryLimit { - log.Infof("WARNING: Your kernel does not support memory limit capabilities. Limitation discarded.\n") + log.Infof("WARNING: Your kernel does not support memory limit capabilities. Limitation discarded.") container.Config.Memory = 0 } if container.Config.Memory > 0 && !container.daemon.sysInfo.SwapLimit { - log.Infof("WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.\n") + log.Infof("WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.") container.Config.MemorySwap = -1 } if container.daemon.sysInfo.IPv4ForwardingDisabled { diff --git a/daemon/daemon.go b/daemon/daemon.go index 90cb6a89e1..04d3327546 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -382,7 +382,7 @@ func (daemon *Daemon) restore() error { } if !debug { - log.Infof(": done.\n") + log.Infof(": done.") } return nil @@ -1074,7 +1074,7 @@ func (daemon *Daemon) checkLocaldns() error { return err } if len(daemon.config.Dns) == 0 && utils.CheckLocalDns(resolvConf) { - log.Infof("Local (127.0.0.1) DNS resolver found in resolv.conf and containers can't use it. Using default external servers : %v\n", DefaultDns) + log.Infof("Local (127.0.0.1) DNS resolver found in resolv.conf and containers can't use it. Using default external servers : %v", DefaultDns) daemon.config.Dns = DefaultDns } return nil @@ -1125,7 +1125,7 @@ func checkKernelAndArch() error { // the circumstances of pre-3.8 crashes are clearer. // For details see http://github.com/docker/docker/issues/407 if k, err := kernel.GetKernelVersion(); err != nil { - log.Infof("WARNING: %s\n", err) + log.Infof("WARNING: %s", err) } else { if kernel.CompareKernelVersion(k, &kernel.KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 { if os.Getenv("DOCKER_NOWARN_KERNEL_VERSION") == "" { diff --git a/daemon/delete.go b/daemon/delete.go index 131501590f..501aed3e38 100644 --- a/daemon/delete.go +++ b/daemon/delete.go @@ -117,7 +117,7 @@ func (daemon *Daemon) ContainerDestroy(job *engine.Job) engine.Status { for volumeId := range volumes { // If the requested volu if c, exists := usedVolumes[volumeId]; exists { - log.Infof("The volume %s is used by the container %s. Impossible to remove it. Skipping.\n", volumeId, c.ID) + log.Infof("The volume %s is used by the container %s. Impossible to remove it. Skipping.", volumeId, c.ID) continue } if err := daemon.Volumes().Delete(volumeId); err != nil { diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go index ad5e50a4a5..06cf37e79f 100644 --- a/daemon/networkdriver/bridge/driver.go +++ b/daemon/networkdriver/bridge/driver.go @@ -368,7 +368,7 @@ func Release(job *engine.Job) engine.Status { } if err := ipallocator.ReleaseIP(bridgeNetwork, &containerInterface.IP); err != nil { - log.Infof("Unable to release ip %s\n", err) + log.Infof("Unable to release ip %s", err) } return engine.StatusOK }