prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1578 from NickrenREN/sysfs-new

Browse Source 
optimize NewRealSysFs()
This commit is contained in:
David Ashpole 2017-03-14 21:28:05 -07:00 committed by GitHub
commit fb28b0da1b
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cadvisor.go
View File

@ -117,10 +117,7 @@ func main() {
glog.Fatalf("Failed to initialize storage driver: %s", err) glog.Fatalf("Failed to initialize storage driver: %s", err)
} }
sysFs, err := sysfs.NewRealSysFs() sysFs := sysfs.NewRealSysFs()
if err != nil {
glog.Fatalf("Failed to create a system interface: %s", err)
}
collectorHttpClient := createCollectorHttpClient(*collectorCert, *collectorKey) collectorHttpClient := createCollectorHttpClient(*collectorCert, *collectorKey)

4
utils/sysfs/sysfs.go
View File

@ -70,8 +70,8 @@ type SysFs interface {
type realSysFs struct{} type realSysFs struct{}
func NewRealSysFs() (SysFs, error) { func NewRealSysFs() SysFs {
return &realSysFs{}, nil return &realSysFs{}
} }
func (self *realSysFs) GetBlockDevices() ([]os.FileInfo, error) { func (self *realSysFs) GetBlockDevices() ([]os.FileInfo, error) {

5
utils/sysinfo/sysinfo.go
View File

@ -155,10 +155,7 @@ func GetCacheInfo(sysFs sysfs.SysFs, id int) ([]sysfs.CacheInfo, error) {
func GetNetworkStats(name string) (info.InterfaceStats, error) { func GetNetworkStats(name string) (info.InterfaceStats, error) {
// TODO(rjnagal): Take syfs as an argument. // TODO(rjnagal): Take syfs as an argument.
sysFs, err := sysfs.NewRealSysFs() sysFs := sysfs.NewRealSysFs()
if err != nil {
return info.InterfaceStats{}, err
}
return getNetworkStats(name, sysFs) return getNetworkStats(name, sysFs)
} }