Signed-off-by: Victor Vieux <vieux@docker.com>
| ... | ... |
@@ -1036,7 +1036,7 @@ func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, local |
| 1036 | 1036 |
log.Debugf("Calling %s %s", localMethod, localRoute)
|
| 1037 | 1037 |
|
| 1038 | 1038 |
if logging {
|
| 1039 |
- log.Infof("%s %s\n", r.Method, r.RequestURI)
|
|
| 1039 |
+ log.Infof("%s %s", r.Method, r.RequestURI)
|
|
| 1040 | 1040 |
} |
| 1041 | 1041 |
|
| 1042 | 1042 |
if strings.Contains(r.Header.Get("User-Agent"), "Docker-Client/") {
|
| ... | ... |
@@ -1352,7 +1352,7 @@ func ServeApi(job *engine.Job) engine.Status {
|
| 1352 | 1352 |
return job.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)
|
| 1353 | 1353 |
} |
| 1354 | 1354 |
go func() {
|
| 1355 |
- log.Infof("Listening for HTTP on %s (%s)\n", protoAddrParts[0], protoAddrParts[1])
|
|
| 1355 |
+ log.Infof("Listening for HTTP on %s (%s)", protoAddrParts[0], protoAddrParts[1])
|
|
| 1356 | 1356 |
chErrors <- ListenAndServe(protoAddrParts[0], protoAddrParts[1], job) |
| 1357 | 1357 |
}() |
| 1358 | 1358 |
} |
| ... | ... |
@@ -946,11 +946,11 @@ func (container *Container) initializeNetworking() error {
|
| 946 | 946 |
// Make sure the config is compatible with the current kernel |
| 947 | 947 |
func (container *Container) verifyDaemonSettings() {
|
| 948 | 948 |
if container.Config.Memory > 0 && !container.daemon.sysInfo.MemoryLimit {
|
| 949 |
- log.Infof("WARNING: Your kernel does not support memory limit capabilities. Limitation discarded.\n")
|
|
| 949 |
+ log.Infof("WARNING: Your kernel does not support memory limit capabilities. Limitation discarded.")
|
|
| 950 | 950 |
container.Config.Memory = 0 |
| 951 | 951 |
} |
| 952 | 952 |
if container.Config.Memory > 0 && !container.daemon.sysInfo.SwapLimit {
|
| 953 |
- log.Infof("WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.\n")
|
|
| 953 |
+ log.Infof("WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.")
|
|
| 954 | 954 |
container.Config.MemorySwap = -1 |
| 955 | 955 |
} |
| 956 | 956 |
if container.daemon.sysInfo.IPv4ForwardingDisabled {
|
| ... | ... |
@@ -382,7 +382,7 @@ func (daemon *Daemon) restore() error {
|
| 382 | 382 |
} |
| 383 | 383 |
|
| 384 | 384 |
if !debug {
|
| 385 |
- log.Infof(": done.\n")
|
|
| 385 |
+ log.Infof(": done.")
|
|
| 386 | 386 |
} |
| 387 | 387 |
|
| 388 | 388 |
return nil |
| ... | ... |
@@ -1074,7 +1074,7 @@ func (daemon *Daemon) checkLocaldns() error {
|
| 1074 | 1074 |
return err |
| 1075 | 1075 |
} |
| 1076 | 1076 |
if len(daemon.config.Dns) == 0 && utils.CheckLocalDns(resolvConf) {
|
| 1077 |
- 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)
|
|
| 1077 |
+ 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)
|
|
| 1078 | 1078 |
daemon.config.Dns = DefaultDns |
| 1079 | 1079 |
} |
| 1080 | 1080 |
return nil |
| ... | ... |
@@ -1125,7 +1125,7 @@ func checkKernelAndArch() error {
|
| 1125 | 1125 |
// the circumstances of pre-3.8 crashes are clearer. |
| 1126 | 1126 |
// For details see http://github.com/docker/docker/issues/407 |
| 1127 | 1127 |
if k, err := kernel.GetKernelVersion(); err != nil {
|
| 1128 |
- log.Infof("WARNING: %s\n", err)
|
|
| 1128 |
+ log.Infof("WARNING: %s", err)
|
|
| 1129 | 1129 |
} else {
|
| 1130 | 1130 |
if kernel.CompareKernelVersion(k, &kernel.KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 {
|
| 1131 | 1131 |
if os.Getenv("DOCKER_NOWARN_KERNEL_VERSION") == "" {
|
| ... | ... |
@@ -117,7 +117,7 @@ func (daemon *Daemon) ContainerDestroy(job *engine.Job) engine.Status {
|
| 117 | 117 |
for volumeId := range volumes {
|
| 118 | 118 |
// If the requested volu |
| 119 | 119 |
if c, exists := usedVolumes[volumeId]; exists {
|
| 120 |
- log.Infof("The volume %s is used by the container %s. Impossible to remove it. Skipping.\n", volumeId, c.ID)
|
|
| 120 |
+ log.Infof("The volume %s is used by the container %s. Impossible to remove it. Skipping.", volumeId, c.ID)
|
|
| 121 | 121 |
continue |
| 122 | 122 |
} |
| 123 | 123 |
if err := daemon.Volumes().Delete(volumeId); err != nil {
|
| ... | ... |
@@ -368,7 +368,7 @@ func Release(job *engine.Job) engine.Status {
|
| 368 | 368 |
} |
| 369 | 369 |
|
| 370 | 370 |
if err := ipallocator.ReleaseIP(bridgeNetwork, &containerInterface.IP); err != nil {
|
| 371 |
- log.Infof("Unable to release ip %s\n", err)
|
|
| 371 |
+ log.Infof("Unable to release ip %s", err)
|
|
| 372 | 372 |
} |
| 373 | 373 |
return engine.StatusOK |
| 374 | 374 |
} |