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

Made the code more DRY

Browse Source
This commit is contained in:
Diptanu Choudhury
2015-11-15 23:53:04 -05:00
committed by Alex Dadgar
parent 041f48dc71
commit c01f2a38f5
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/driver/docker.go
View File

@@ -215,12 +215,12 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task, dri
return c, fmt.Errorf("Unable to parse docker.privileged.enabled: %s", err)
}
if taskPrivileged := driverConfig.Privileged; taskPrivileged {
if taskPrivileged && !hostPrivileged {
if driverConfig.Privileged {
if !hostPrivileged {
return c, fmt.Errorf(`Unable to set privileged flag since "docker.privileged.enabled" is false`)
}
hostConfig.Privileged = taskPrivileged
hostConfig.Privileged = driverConfig.Privileged
}
// set DNS servers
@@ -303,8 +303,7 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task, dri
config.ExposedPorts = exposedPorts
}
rawArgs := driverConfig.Args
parsedArgs, err := args.ParseAndReplace(rawArgs, env.Map())
parsedArgs, err := args.ParseAndReplace(driverConfig.Args, env.Map())
if err != nil {
return c, err
}

4
client/driver/exec.go
View File

@@ -92,8 +92,8 @@ func (d *ExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
// Look for arguments
var args []string
if argRaw := driverConfig.Args; argRaw != "" {
args = append(args, argRaw)
if driverConfig.Args != "" {
args = append(args, driverConfig.Args)
}
// Setup the command

2
client/driver/executor/test_harness.go
View File

@@ -21,7 +21,7 @@ var (
Networks: []*structs.NetworkResource{
&structs.NetworkResource{
MBits: 50,
DynamicPorts: []structs.Port{structs.Port{Label: "http"}},
DynamicPorts: []structs.Port{{Label: "http"}},
},
},
}

4
client/driver/java.go
View File

@@ -133,8 +133,8 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
// Build the argument list.
args = append(args, "-jar", filepath.Join(allocdir.TaskLocal, jarName))
if argRaw := driverConfig.Args; argRaw != "" {
args = append(args, argRaw)
if driverConfig.Args != "" {
args = append(args, driverConfig.Args)
}
// Setup the command

4
client/driver/qemu.go
View File

@@ -115,8 +115,8 @@ func (d *QemuDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
// Parse configuration arguments
// Create the base arguments
accelerator := "tcg"
if acc := driverConfig.Accelerator; acc != "" {
accelerator = acc
if driverConfig.Accelerator != "" {
accelerator = driverConfig.Accelerator
}
// TODO: Check a lower bounds, e.g. the default 128 of Qemu
mem := fmt.Sprintf("%dM", task.Resources.MemoryMB)

4
client/driver/raw_exec.go
View File

@@ -94,8 +94,8 @@ func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandl
// Look for arguments
var args []string
if argRaw := driverConfig.Args; argRaw != "" {
args = append(args, argRaw)
if driverConfig.Args != "" {
args = append(args, driverConfig.Args)
}
// Setup the command

4
client/driver/rkt.go
View File

@@ -149,8 +149,8 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e
}
// Add user passed arguments.
if userArgs := driverConfig.Args; userArgs != "" {
parsed, err := args.ParseAndReplace(userArgs, envVars.Map())
if driverConfig.Args != "" {
parsed, err := args.ParseAndReplace(driverConfig.Args, envVars.Map())
if err != nil {
return nil, err
}