From 7ba1f7e60fc2088506b8e7703d169ec3128f3e7c Mon Sep 17 00:00:00 2001
From: Ron Lai <ronl@google.com>
Date: Fri, 17 Jun 2016 14:51:51 -0700
Subject: [PATCH] Don't rely on the returned value when there's an error

---
 manager/manager.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/manager/manager.go b/manager/manager.go
index eb9c60981f..f1e4b0e21e 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -137,13 +137,19 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn
 	}
 	glog.Infof("cAdvisor running in container: %q", selfContainer)
 
-	dockerStatus, err := docker.Status()
-	if err != nil {
+	var (
+		dockerStatus info.DockerStatus
+		rktPath      string
+	)
+	if tempDockerStatus, err := docker.Status(); err != nil {
 		glog.Warningf("Unable to connect to Docker: %v", err)
+	} else {
+		dockerStatus = tempDockerStatus
 	}
-	rktPath, err := rkt.RktPath()
-	if err != nil {
+	if tmpRktPath, err := rkt.RktPath(); err != nil {
 		glog.Warningf("unable to connect to Rkt api service: %v", err)
+	} else {
+		rktPath = tmpRktPath
 	}
 
 	context := fs.Context{