Merge pull request #3135 from clinta/docker-log-retry

fix logging re-init
hashicorp · Aug 30, 2017 · b42eac1 · b42eac1
2 parents ea4f1c2 + cfffce0
commit b42eac1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -924,7 +924,7 @@ func (d *DockerDriver) createContainerConfig(ctx *ExecContext, task *structs.Tas
 
 	memLimit := int64(task.Resources.MemoryMB) * 1024 * 1024
 
-	if len(driverConfig.Logging) == 0 {
+	if len(driverConfig.Logging) == 0 || driverConfig.Logging[0].Type == "syslog" {
 		if runtime.GOOS != "darwin" {
 			d.logger.Printf("[DEBUG] driver.docker: Setting default logging options to syslog and %s", syslogAddr)
 			driverConfig.Logging = []DockerLoggingOpts{