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

Merge pull request #570 from vmarmol/less-log

Browse Source 
Don't fail requests if System UUID is not available.
This commit is contained in:
Vish Kannan 2015-03-10 09:45:40 -07:00
commit 62a1788621
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manager/machine.go
View File

@ -265,9 +265,10 @@ func getMachineInfo(sysFs sysfs.SysFs) (*info.MachineInfo, error) {
return nil, err return nil, err
} }
system_uuid, err := sysinfo.GetSystemUUID(sysFs) systemUUID, err := sysinfo.GetSystemUUID(sysFs)
if err != nil { if err != nil {
return nil, err glog.Errorf("Failed to get system UUID: %v", err)
systemUUID = ""
} }
machineInfo := &info.MachineInfo{ machineInfo := &info.MachineInfo{
@ -278,7 +279,7 @@ func getMachineInfo(sysFs sysfs.SysFs) (*info.MachineInfo, error) {
NetworkDevices: netDevices, NetworkDevices: netDevices,
Topology: topology, Topology: topology,
MachineID: getMachineID(), MachineID: getMachineID(),
SystemUUID: system_uuid, SystemUUID: systemUUID,
} }
for _, fs := range filesystems { for _, fs := range filesystems {