Merge pull request google#570 from vmarmol/less-log

vishh · vishh · commit 62a1788621f4 · 2015-03-10T09:45:40.000-07:00
Don't fail requests if System UUID is not available.
diff --git a/manager/machine.go b/manager/machine.go
@@ -265,9 +265,10 @@ func getMachineInfo(sysFs sysfs.SysFs) (*info.MachineInfo, error) {
 		return nil, err
 	}
 
-	system_uuid, err := sysinfo.GetSystemUUID(sysFs)
+	systemUUID, err := sysinfo.GetSystemUUID(sysFs)
 	if err != nil {
-		return nil, err
+		glog.Errorf("Failed to get system UUID: %v", err)
+		systemUUID = ""
 	}
 
 	machineInfo := &info.MachineInfo{
@@ -278,7 +279,7 @@ func getMachineInfo(sysFs sysfs.SysFs) (*info.MachineInfo, error) {
 		NetworkDevices: netDevices,
 		Topology:       topology,
 		MachineID:      getMachineID(),
-		SystemUUID:     system_uuid,
+		SystemUUID:     systemUUID,
 	}
 
 	for _, fs := range filesystems {

Original file line number	Diff line number	Diff line change
`@@ -265,9 +265,10 @@ func getMachineInfo(sysFs sysfs.SysFs) (*info.MachineInfo, error) {`
`265`	`265`	`return nil, err`
`266`	`266`	`}`
`267`	`267`
`268`		`- system_uuid, err := sysinfo.GetSystemUUID(sysFs)`
	`268`	`+ systemUUID, err := sysinfo.GetSystemUUID(sysFs)`
`269`	`269`	`if err != nil {`
`270`		`- return nil, err`
	`270`	`+ glog.Errorf("Failed to get system UUID: %v", err)`
	`271`	`+ systemUUID = ""`
`271`	`272`	`}`
`272`	`273`
`273`	`274`	`machineInfo := &info.MachineInfo{`
`@@ -278,7 +279,7 @@ func getMachineInfo(sysFs sysfs.SysFs) (*info.MachineInfo, error) {`
`278`	`279`	`NetworkDevices: netDevices,`
`279`	`280`	`Topology: topology,`
`280`	`281`	`MachineID: getMachineID(),`
`281`		`- SystemUUID: system_uuid,`
	`282`	`+ SystemUUID: systemUUID,`
`282`	`283`	`}`
`283`	`284`
`284`	`285`	`for _, fs := range filesystems {`