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

refacotoring simplification from code review

Browse Source
This commit is contained in:
Chelsea Holland Komlo
2018-04-09 10:34:17 -04:00
parent d251199432
commit 4c1c88a91c
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/driver/docker.go
View File

@@ -1019,11 +1019,10 @@ func (d *DockerDriver) dockerHealthCheckClient() (*docker.Client, error) {
return healthCheckClient, nil
}
newHealthCheckClient, err := d.newDockerClient(dockerHealthCheckTimeout)
var err error
healthCheckClient, err = d.newDockerClient(dockerHealthCheckTimeout)
if err != nil {
return nil, err
} else {
healthCheckClient = newHealthCheckClient
}
return healthCheckClient, nil
@@ -1041,23 +1040,18 @@ func (d *DockerDriver) dockerClients() (*docker.Client, *docker.Client, error) {
return client, waitClient, nil
}
var merr multierror.Error
newClient, err := d.newDockerClient(dockerTimeout)
var err error
client, err = d.newDockerClient(dockerTimeout)
if err != nil {
merr.Errors = append(merr.Errors, err)
} else {
client = newClient
return nil, nil, err
}
newWaitClient, err := d.newDockerClient(0 * time.Minute)
waitClient, err = d.newDockerClient(0 * time.Minute)
if err != nil {
merr.Errors = append(merr.Errors, err)
} else {
waitClient = newWaitClient
return nil, nil, err
}
return client, waitClient, merr.ErrorOrNil()
return client, waitClient, nil
}
// newDockerClient creates a new *docker.Client with a configurable timeout