From f3dc35169780e1555b4116986649b729cb80b5d1 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Wed, 22 Apr 2015 08:15:00 +0800 Subject: [PATCH] remove redundant warning And warning is not supposed to have a prefix WARNING. Signed-off-by: Qiang Huang --- pkg/sysinfo/sysinfo.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go index d1dcea3bf8..76a61fa95f 100644 --- a/pkg/sysinfo/sysinfo.go +++ b/pkg/sysinfo/sysinfo.go @@ -23,33 +23,32 @@ func New(quiet bool) *SysInfo { sysInfo := &SysInfo{} if cgroupMemoryMountpoint, err := cgroups.FindCgroupMountpoint("memory"); err != nil { if !quiet { - logrus.Warnf("%s", err) + logrus.Warnf("%v", err) } } else { _, err1 := ioutil.ReadFile(path.Join(cgroupMemoryMountpoint, "memory.limit_in_bytes")) _, err2 := ioutil.ReadFile(path.Join(cgroupMemoryMountpoint, "memory.soft_limit_in_bytes")) sysInfo.MemoryLimit = err1 == nil && err2 == nil if !sysInfo.MemoryLimit && !quiet { - logrus.Warnf("Your kernel does not support cgroup memory limit.") + logrus.Warn("Your kernel does not support cgroup memory limit.") } _, err = ioutil.ReadFile(path.Join(cgroupMemoryMountpoint, "memory.memsw.limit_in_bytes")) sysInfo.SwapLimit = err == nil if !sysInfo.SwapLimit && !quiet { - logrus.Warnf("Your kernel does not support cgroup swap limit.") + logrus.Warn("Your kernel does not support cgroup swap limit.") } } if cgroupCpuMountpoint, err := cgroups.FindCgroupMountpoint("cpu"); err != nil { if !quiet { - logrus.Warnf("WARING: %s\n", err) + logrus.Warnf("%v", err) } } else { _, err1 := ioutil.ReadFile(path.Join(cgroupCpuMountpoint, "cpu.cfs_quota_us")) - logrus.Warnf("%s", cgroupCpuMountpoint) sysInfo.CpuCfsQuota = err1 == nil if !sysInfo.CpuCfsQuota && !quiet { - logrus.Warnf("WARING: Your kernel does not support cgroup cfs quotas") + logrus.Warn("Your kernel does not support cgroup cfs quotas") } }