Skip to content

Commit

Permalink
Merge pull request #940 from jimmidyson/docker-client-update
Browse files Browse the repository at this point in the history
Don't bail out if docker is unreachable - recover when back up
  • Loading branch information
jimmidyson committed Oct 23, 2015
2 parents 81aa0d7 + 68db031 commit 038c703
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 038c703

Please sign in to comment.