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

Merge pull request #12545 from coolljt0725/remove_rudundant_enter

Browse source 
Remove redundant `\n` in daemon/daemon.go
This commit is contained in:
Phil Estes 2015-04-20 14:32:27 -04:00
commit 490a0bd697
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/daemon.go
View file

@ -1233,18 +1233,18 @@ func (daemon *Daemon) verifyHostConfig(hostConfig *runconfig.HostConfig) ([]stri
return warnings, fmt.Errorf("Minimum memory limit allowed is 4MB") return warnings, fmt.Errorf("Minimum memory limit allowed is 4MB")
} }
if hostConfig.Memory > 0 && !daemon.SystemConfig().MemoryLimit { if hostConfig.Memory > 0 && !daemon.SystemConfig().MemoryLimit {
warnings = append(warnings, "Your kernel does not support memory limit capabilities. Limitation discarded.\n") warnings = append(warnings, "Your kernel does not support memory limit capabilities. Limitation discarded.")
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 {
warnings = append(warnings, "Your kernel does not support swap limit capabilities. Limitation discarded.\n") warnings = append(warnings, "Your kernel does not support swap limit capabilities, memory limited without swap.")
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 {
return warnings, fmt.Errorf("Minimum memoryswap limit should be larger than memory limit, see usage.\n") return warnings, fmt.Errorf("Minimum memoryswap limit should be larger than memory limit, see usage.")
} }
if hostConfig.Memory == 0 && hostConfig.MemorySwap > 0 { if hostConfig.Memory == 0 && hostConfig.MemorySwap > 0 {
return warnings, fmt.Errorf("You should always set the Memory limit when using Memoryswap limit, see usage.\n") return warnings, fmt.Errorf("You should always set the Memory limit when using Memoryswap limit, see usage.")
} }
return warnings, nil return warnings, nil