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

Revert "Make drivers take arguments as a list and not as a string"

Browse Source
This commit is contained in:
Alex Dadgar
2015-11-18 13:46:43 -08:00
parent c56bb46f67
commit d666f5bde1
29 changed files with 205 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/driver/executor/exec_basic.go
View File

@@ -29,6 +29,7 @@ type BasicExecutor struct {
allocDir string
}
// TODO: Have raw_exec use this as well.
func NewBasicExecutor() Executor {
return &BasicExecutor{}
}
@@ -62,7 +63,12 @@ func (e *BasicExecutor) Start() error {
}
e.cmd.Path = args.ReplaceEnv(e.cmd.Path, envVars.Map())
e.cmd.Args = args.ParseAndReplace(e.cmd.Args, envVars.Map())
combined := strings.Join(e.cmd.Args, " ")
parsed, err := args.ParseAndReplace(combined, envVars.Map())
if err != nil {
return err
}
e.cmd.Args = parsed
spawnState := filepath.Join(e.allocDir, fmt.Sprintf("%s_%s", e.taskName, "exit_status"))
e.spawn = spawn.NewSpawner(spawnState)