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

Remove debug logging

Browse Source
This commit is contained in:
Michael Schurter
2017-01-05 16:04:51 -08:00
parent 86db19407e
commit 12915c30bf
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -272,8 +272,6 @@ func (e *UniversalExecutor) LaunchCmd(command *ExecCommand) (*ProcessState, erro
return nil, err
}
e.logger.Printf("[DEBUG] executor: XXX 1")
// Setup the loggers
if err := e.configureLoggers(); err != nil {
return nil, err
@@ -281,27 +279,18 @@ func (e *UniversalExecutor) LaunchCmd(command *ExecCommand) (*ProcessState, erro
e.cmd.Stdout = e.lro
e.cmd.Stderr = e.lre
e.logger.Printf("[DEBUG] executor: XXX 2")
// Look up the binary path and make it executable
absPath, err := e.lookupBin(e.ctx.TaskEnv.ReplaceEnv(command.Cmd))
if err != nil {
return nil, err
}
e.logger.Printf("[DEBUG] executor: XXX abs: %q", absPath)
if err := e.makeExecutable(absPath); err != nil {
return nil, err
}
path := absPath
e.logger.Printf("[DEBUG] executor: XXX cmd.Path=%q", path)
e.logger.Printf("[DEBUG] executor: XXX cmd.Args=%q", e.cmd.Args)
e.logger.Printf("[DEBUG] executor: XXX cmd.Dir= %q", e.cmd.Dir)
e.logger.Printf("[DEBUG] executor: XXX cmd.Sys= %#v", e.cmd.SysProcAttr)
// Determine the path to run as it may have to be relative to the chroot.
if e.fsIsolationEnforced {
rel, err := filepath.Rel(e.ctx.TaskDir, path)
@@ -316,11 +305,6 @@ func (e *UniversalExecutor) LaunchCmd(command *ExecCommand) (*ProcessState, erro
e.cmd.Args = append([]string{e.cmd.Path}, e.ctx.TaskEnv.ParseAndReplace(command.Args)...)
e.cmd.Env = e.ctx.TaskEnv.EnvList()
e.logger.Printf("[DEBUG] executor: XXX cmd.Path=%q", path)
e.logger.Printf("[DEBUG] executor: XXX cmd.Args=%q", e.cmd.Args)
e.logger.Printf("[DEBUG] executor: XXX cmd.Dir= %q", e.cmd.Dir)
e.logger.Printf("[DEBUG] executor: XXX cmd.Sys= %#v", e.cmd.SysProcAttr)
// Start the process
if err := e.cmd.Start(); err != nil {
return nil, fmt.Errorf("failed to start command path=%q --- args=%q: %v", path, e.cmd.Args, err)
@@ -336,9 +320,6 @@ func (e *UniversalExecutor) configureLoggers() error {
e.rotatorLock.Lock()
defer e.rotatorLock.Unlock()
e.logger.Printf("[DEBUG] executor: XXX logdir= %q", e.ctx.LogDir)
e.logger.Printf("[DEBUG] executor: XXX task = %q", e.ctx.Task.Name)
logFileSize := int64(e.ctx.Task.LogConfig.MaxFileSizeMB * 1024 * 1024)
if e.lro == nil {
lro, err := logging.NewFileRotator(e.ctx.LogDir, fmt.Sprintf("%v.stdout", e.ctx.Task.Name),

7
client/driver/raw_exec.go
View File

@@ -115,16 +115,12 @@ func (d *RawExecDriver) Prestart(ctx *ExecContext, task *structs.Task) error {
func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, error) {
var driverConfig ExecDriverConfig
if err := mapstructure.WeakDecode(task.Config, &driverConfig); err != nil {
d.logger.Printf("[WARN] driver.raw_exec: XXX error decoding config")
return nil, err
}
// Get the tasks local directory.
taskName := d.DriverContext.taskName
// Get the command to be ran
command := driverConfig.Command
if err := validateCommand(command, "args"); err != nil {
d.logger.Printf("[WARN] driver.raw_exec: XXX error validating command")
return nil, err
}
@@ -139,7 +135,6 @@ func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandl
exec, pluginClient, err := createExecutor(pluginConfig, d.config.LogOutput, d.config)
if err != nil {
d.logger.Printf("[WARN] driver.raw_exec: XXX error creating executor")
return nil, err
}
executorCtx := &executor.ExecutorContext{
@@ -162,8 +157,6 @@ func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandl
}
ps, err := exec.LaunchCmd(execCmd)
if err != nil {
d.logger.Printf("[WARN] driver.raw_exec: XXX error launching command: %v", err)
d.logger.Printf("[WARN] driver.raw_exec: XXX error launching command: cmd=%q --- args=%q --- user=%q", command, driverConfig.Args, task.User)
pluginClient.Kill()
return nil, err
}