From a248c345280c8db14767e282fb47b3649d80c16e Mon Sep 17 00:00:00 2001 From: NickrenREN Date: Tue, 24 Jan 2017 17:58:39 +0800 Subject: [PATCH] optimize NewRealSysFs() remove second return value since it will never return err --- cadvisor.go | 5 +---- utils/sysfs/sysfs.go | 4 ++-- utils/sysinfo/sysinfo.go | 5 +---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cadvisor.go b/cadvisor.go index 48ddc8ae..70faa2a2 100644 --- a/cadvisor.go +++ b/cadvisor.go @@ -117,10 +117,7 @@ func main() { glog.Fatalf("Failed to initialize storage driver: %s", err) } - sysFs, err := sysfs.NewRealSysFs() - if err != nil { - glog.Fatalf("Failed to create a system interface: %s", err) - } + sysFs := sysfs.NewRealSysFs() collectorHttpClient := createCollectorHttpClient(*collectorCert, *collectorKey) diff --git a/utils/sysfs/sysfs.go b/utils/sysfs/sysfs.go index 5667e016..1132e5b5 100644 --- a/utils/sysfs/sysfs.go +++ b/utils/sysfs/sysfs.go @@ -70,8 +70,8 @@ type SysFs interface { type realSysFs struct{} -func NewRealSysFs() (SysFs, error) { - return &realSysFs{}, nil +func NewRealSysFs() SysFs { + return &realSysFs{} } func (self *realSysFs) GetBlockDevices() ([]os.FileInfo, error) { diff --git a/utils/sysinfo/sysinfo.go b/utils/sysinfo/sysinfo.go index 8f7acc74..7dd14cf4 100644 --- a/utils/sysinfo/sysinfo.go +++ b/utils/sysinfo/sysinfo.go @@ -155,10 +155,7 @@ func GetCacheInfo(sysFs sysfs.SysFs, id int) ([]sysfs.CacheInfo, error) { func GetNetworkStats(name string) (info.InterfaceStats, error) { // TODO(rjnagal): Take syfs as an argument. - sysFs, err := sysfs.NewRealSysFs() - if err != nil { - return info.InterfaceStats{}, err - } + sysFs := sysfs.NewRealSysFs() return getNetworkStats(name, sysFs) }