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

docker: unexport new coordinator func

Browse Source
This commit is contained in:
Nick Ethier
2018-11-19 23:07:07 -05:00
parent fab76c6c0b
commit 2393f6a008
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/docker/config.go
View File

@@ -437,7 +437,7 @@ func (d *Driver) SetConfig(data []byte, cfg *base.ClientAgentConfig) error {
removeDelay: d.config.GC.imageDelayDuration,
}
d.coordinator = NewDockerCoordinator(coordinatorConfig)
d.coordinator = newDockerCoordinator(coordinatorConfig)
return nil
}

4
drivers/docker/coordinator.go
View File

@@ -109,8 +109,8 @@ type dockerCoordinator struct {
deleteFuture map[string]context.CancelFunc
}
// NewDockerCoordinator returns a new Docker coordinator
func NewDockerCoordinator(config *dockerCoordinatorConfig) *dockerCoordinator {
// newDockerCoordinator returns a new Docker coordinator
func newDockerCoordinator(config *dockerCoordinatorConfig) *dockerCoordinator {
if config.client == nil {
return nil
}

8
drivers/docker/coordinator_test.go
View File

@@ -68,7 +68,7 @@ func TestDockerCoordinator_ConcurrentPulls(t *testing.T) {
}
// Create a coordinator
coordinator := NewDockerCoordinator(config)
coordinator := newDockerCoordinator(config)
id, _ := coordinator.PullImage(image, nil, uuid.Generate(), nil)
for i := 0; i < 9; i++ {
@@ -119,7 +119,7 @@ func TestDockerCoordinator_Pull_Remove(t *testing.T) {
}
// Create a coordinator
coordinator := NewDockerCoordinator(config)
coordinator := newDockerCoordinator(config)
id := ""
callerIDs := make([]string, 10, 10)
@@ -186,7 +186,7 @@ func TestDockerCoordinator_Remove_Cancel(t *testing.T) {
}
// Create a coordinator
coordinator := NewDockerCoordinator(config)
coordinator := newDockerCoordinator(config)
callerID := uuid.Generate()
// Pull image
@@ -234,7 +234,7 @@ func TestDockerCoordinator_No_Cleanup(t *testing.T) {
}
// Create a coordinator
coordinator := NewDockerCoordinator(config)
coordinator := newDockerCoordinator(config)
callerID := uuid.Generate()
// Pull image

1
drivers/docker/docklog/plugin.go
View File

@@ -15,7 +15,6 @@ import (
const PluginName = "docker_logger"
// LaunchDockerLogger launches an instance of DockerLogger
// TODO: Integrate with base plugin loader
func LaunchDockerLogger(logger hclog.Logger) (DockerLogger, *plugin.Client, error) {
logger = logger.Named(PluginName)
bin, err := discover.NomadExecutable()