remove PID from logging to avoid race on process exit (#352)

TritonDataCenter · May 30, 2017 · c45436a · c45436a
1 parent 3372754
commit c45436a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/commands/commands.go b/commands/commands.go
@@ -171,7 +171,7 @@ func (c *Command) setUpCmd() {
 func (c *Command) Kill() error {
 	log.Debugf("%s.kill", c.Name)
 	if c.Cmd != nil && c.Cmd.Process != nil {
-		log.Warnf("killing command at pid: %d", c.Cmd.Process.Pid)
+		log.Warnf("killing command for %s", c.Name)
 		return c.Cmd.Process.Kill()
 	}
 	return nil
@@ -180,7 +180,6 @@ func (c *Command) Kill() error {
 func (c *Command) waitForTimeout() error {
 
 	quit := make(chan int)
-	cmd := c.Cmd
 
 	// for commands that don't have a timeout we just block forever;
 	// this is required for backwards compat.
@@ -212,7 +211,7 @@ func (c *Command) waitForTimeout() error {
 		// we'll deadlock
 		defer func() { quit <- 0 }()
 	}
-	log.Debugf("%s.run waiting for PID %d: ", c.Name, cmd.Process.Pid)
+	log.Debugf("%s.run waiting", c.Name)
 
 	defer reapChildren(c.Cmd.SysProcAttr.Pgid)
 	err := c.Cmd.Wait()