From aa8697140d0081d8619ea0b79581ab5ab0364e71 Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Thu, 12 Mar 2015 14:48:12 -0700 Subject: [PATCH] Don't fail fetching machine information when not available --- manager/machine.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/manager/machine.go b/manager/machine.go index c424cbf6..694359f7 100644 --- a/manager/machine.go +++ b/manager/machine.go @@ -243,28 +243,27 @@ func getMachineInfo(sysFs sysfs.SysFs, fsInfo fs.FsInfo) (*info.MachineInfo, err filesystems, err := fsInfo.GetGlobalFsInfo() if err != nil { - return nil, err + glog.Errorf("Failed to get global filesystem information: %v", err) } diskMap, err := sysinfo.GetBlockDeviceInfo(sysFs) if err != nil { - return nil, err + glog.Errorf("Failed to get disk map: %v", err) } netDevices, err := sysinfo.GetNetworkDevices(sysFs) if err != nil { - return nil, err + glog.Errorf("Failed to get network devices: %v", err) } topology, numCores, err := getTopology(sysFs, string(cpuinfo)) if err != nil { - return nil, err + glog.Errorf("Failed to get topology information: %v", err) } systemUUID, err := sysinfo.GetSystemUUID(sysFs) if err != nil { glog.Errorf("Failed to get system UUID: %v", err) - systemUUID = "" } machineInfo := &info.MachineInfo{