kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-05 09:55:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

only initialize docker clients if they are nil

Browse Source
This commit is contained in:
Chelsea Holland Komlo
2018-04-09 14:13:07 -04:00
parent 4c1c88a91c
commit c6cd78db59
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/driver/docker.go
View File

@@ -1041,14 +1041,21 @@ func (d *DockerDriver) dockerClients() (*docker.Client, *docker.Client, error) {
}
var err error
client, err = d.newDockerClient(dockerTimeout)
if err != nil {
return nil, nil, err
// Onlt initialize the client if it hasn't yet been done
if client == nil {
client, err = d.newDockerClient(dockerTimeout)
if err != nil {
return nil, nil, err
}
}
waitClient, err = d.newDockerClient(0 * time.Minute)
if err != nil {
return nil, nil, err
// Only initialize the waitClient if it hasn't yet been done
if waitClient == nil {
waitClient, err = d.newDockerClient(0 * time.Minute)
if err != nil {
return nil, nil, err
}
}
return client, waitClient, nil