From 5294330cf7301ddbdcad429972fac7f85d740ee2 Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Fri, 2 Oct 2015 10:54:04 -0700 Subject: [PATCH] go-fmt --- client/driver/docker.go | 26 +++++++++++++------------- client/driver/docker_test.go | 20 ++++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/client/driver/docker.go b/client/driver/docker.go index a36dfa6d0..7f59e7ce3 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -119,20 +119,20 @@ func createContainer(ctx *ExecContext, task *structs.Task, logger *log.Logger) d logger.Printf("[DEBUG] driver.docker: using %d cpu shares for %s", hostConfig.CPUShares, task.Config["image"]) mode, ok := task.Config["network_mode"] - if !ok || mode == "" { - // docker default - logger.Printf("[WARN] driver.docker: no mode specified for networking, defaulting to bridge") - mode = "bridge" - } + if !ok || mode == "" { + // docker default + logger.Printf("[WARN] driver.docker: no mode specified for networking, defaulting to bridge") + mode = "bridge" + } - // Ignore the container mode for now - switch mode { - case "default", "bridge", "none", "host": - logger.Printf("[DEBUG] driver.docker: using %s as network mode", mode) - default: - logger.Printf("[WARN] invalid setting for network mode %s, defaulting to bridge mode on docker0", mode) - mode = "bridge" - } + // Ignore the container mode for now + switch mode { + case "default", "bridge", "none", "host": + logger.Printf("[DEBUG] driver.docker: using %s as network mode", mode) + default: + logger.Printf("[WARN] invalid setting for network mode %s, defaulting to bridge mode on docker0", mode) + mode = "bridge" + } hostConfig.NetworkMode = mode // Setup port mapping (equivalent to -p on docker CLI). Ports must already be diff --git a/client/driver/docker_test.go b/client/driver/docker_test.go index 916327e60..3bea8235a 100644 --- a/client/driver/docker_test.go +++ b/client/driver/docker_test.go @@ -289,16 +289,16 @@ func TestDocker_StartNVersions(t *testing.T) { } func TestDockerHostNet(t *testing.T) { - task := &structs.Task{ - Config: map[string]string{ - "image": "redis", - "network_mode": "host", - }, - Resources: &structs.Resources{ - MemoryMB: 256, - CPU: 512, - }, - } + task := &structs.Task{ + Config: map[string]string{ + "image": "redis", + "network_mode": "host", + }, + Resources: &structs.Resources{ + MemoryMB: 256, + CPU: 512, + }, + } driverCtx := testDriverContext(task.Name) ctx := testDriverExecContext(task, driverCtx) defer ctx.AllocDir.Destroy()