Merge pull request #940 from jimmidyson/docker-client-update

Don't bail out if docker is unreachable - recover when back up
This commit is contained in:
Jimmi Dyson 2015-10-23 13:11:28 +01:00
commit 038c70344c

View File

@ -129,7 +129,7 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn
dockerInfo, err := docker.DockerInfo()
if err != nil {
return nil, err
glog.Warningf("Unable to connect to Docker: %v", err)
}
context := fs.Context{DockerRoot: docker.RootDir(), DockerInfo: dockerInfo}
fsInfo, err := fs.NewFsInfo(context)