luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix panic

This commit is contained in:
Alex Dadgar 2016-10-25 17:27:13 -07:00
parent 4639f43653
commit 3c4a27e72b
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/driver/docker.go
View File

@ -449,13 +449,15 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task,
memLimit := int64(task.Resources.MemoryMB) * 1024 * 1024 memLimit := int64(task.Resources.MemoryMB) * 1024 * 1024
if len(driverConfig.Logging) == 0 { if len(driverConfig.Logging) == 0 {
d.logger.Printf("[DEBUG] driver.docker: Setting default logging options to syslog and %s", syslogAddr) if runtime.GOOS != "darwin" {
driverConfig.Logging = []DockerLoggingOpts{ d.logger.Printf("[DEBUG] driver.docker: Setting default logging options to syslog and %s", syslogAddr)
{Type: "syslog", Config: map[string]string{"syslog-address": syslogAddr}}, driverConfig.Logging = []DockerLoggingOpts{
{Type: "syslog", Config: map[string]string{"syslog-address": syslogAddr}},
}
} }
}
d.logger.Printf("[DEBUG] driver.docker: Using config for logging: %+v", driverConfig.Logging[0]) d.logger.Printf("[DEBUG] driver.docker: deferring logging to docker on Docker for Mac")
}
hostConfig := &docker.HostConfig{ hostConfig := &docker.HostConfig{
// Convert MB to bytes. This is an absolute value. // Convert MB to bytes. This is an absolute value.
@ -468,10 +470,14 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task,
// local directory for storage and a shared alloc directory that can be // local directory for storage and a shared alloc directory that can be
// used to share data between different tasks in the same task group. // used to share data between different tasks in the same task group.
Binds: binds, Binds: binds,
LogConfig: docker.LogConfig{ }
if len(driverConfig.Logging) != 0 {
d.logger.Printf("[DEBUG] driver.docker: Using config for logging: %+v", driverConfig.Logging[0])
hostConfig.LogConfig = docker.LogConfig{
Type: driverConfig.Logging[0].Type, Type: driverConfig.Logging[0].Type,
Config: driverConfig.Logging[0].Config, Config: driverConfig.Logging[0].Config,
}, }
} }
d.logger.Printf("[DEBUG] driver.docker: using %d bytes memory for %s", hostConfig.Memory, task.Name) d.logger.Printf("[DEBUG] driver.docker: using %d bytes memory for %s", hostConfig.Memory, task.Name)

10
client/driver/executor/executor.go
View File

@ -452,8 +452,14 @@ func (e *UniversalExecutor) Exit() error {
if e.syslogServer != nil { if e.syslogServer != nil {
e.syslogServer.Shutdown() e.syslogServer.Shutdown()
} }
e.lre.Close()
e.lro.Close() if e.lre != nil {
e.lre.Close()
}
if e.lro != nil {
e.lro.Close()
}
if e.consulSyncer != nil { if e.consulSyncer != nil {
e.consulSyncer.Shutdown() e.consulSyncer.Shutdown()