From 12915c30bf7c2cb01fb26c5bdda30939a404b2da Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 5 Jan 2017 16:04:51 -0800 Subject: [PATCH] Remove debug logging --- client/driver/executor/executor.go | 19 ------------------- client/driver/raw_exec.go | 7 ------- 2 files changed, 26 deletions(-) diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go index f39ac9164..10a52cc05 100644 --- a/client/driver/executor/executor.go +++ b/client/driver/executor/executor.go @@ -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), diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go index 237d63568..972afe9e0 100644 --- a/client/driver/raw_exec.go +++ b/client/driver/raw_exec.go @@ -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 }