update logrus to 1.0, use Entry.Writer to catch exec stdout (#425)

Fixes a regression in log formatting for exec stdout/stderr; we were
creating a new logger without any of our configuration. In Logrus 1.0
we can access the Writer of a contextual logger and attach it to our
process's stdout/stderr.

backends/backends.go

@@ -73,12 +73,8 @@ func (b *Backend) PollAction() {
 	}
 }
 
-// PollStop closes the Backends logs
-func (b *Backend) PollStop() {
-	if b.onChangeCmd != nil {
-		b.onChangeCmd.CloseLogs()
-	}
-}
+// PollStop is a no-op
+func (b *Backend) PollStop() {}
 
 // CheckForUpstreamChanges checks the service discovery endpoint for any changes
 // in a dependent backend. Returns true when there has been a change.

commands/commands.go

@@ -3,7 +3,6 @@ package commands
 import (
 	"errors"
 	"fmt"
-	"io"
 	"os"
 	"os/exec"
 	"strings"
@@ -25,8 +24,7 @@ type Command struct {
 	Timeout         string
 	TimeoutDuration time.Duration
 	ticker          *time.Ticker
-	logger          io.WriteCloser
-	logFields       log.Fields
+	logger          *log.Entry
 }
 
 // NewCommand parses JSON config into a Command
@@ -45,9 +43,11 @@ func NewCommand(rawArgs interface{}, timeoutFmt string, fields log.Fields) (*Com
 		Args:            args,
 		Timeout:         timeoutFmt,
 		TimeoutDuration: timeout,
-		logger:          log.StandardLogger().Writer(),
-		logFields:       fields,
 	} // Cmd and ticker all created at RunAndWait or RunWithTimeout
+
+	if fields != nil {
+		cmd.logger = log.WithFields(fields)
+	}
 	return cmd, nil
 }
 
@@ -73,7 +73,7 @@ func RunAndWait(c *Command) (int, error) {
 	}
 	log.Debugf("%s.RunAndWait start", c.Name)
 	c.setUpCmd()
-	if c.logFields == nil {
+	if c.logger == nil {
 		c.Cmd.Stdout = os.Stdout
 		c.Cmd.Stderr = os.Stderr
 	}
@@ -169,11 +169,11 @@ func RunWithTimeout(c *Command) error {
 func (c *Command) setUpCmd() {
 	cmd := ArgsToCmd(c.Exec, c.Args)
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
-	if c.logFields == nil {
+	if c.logger == nil {
 		cmd.Stderr = os.Stderr
 	} else {
-		cmd.Stdout = c.logger
-		cmd.Stderr = c.logger
+		cmd.Stdout = c.logger.Writer()
+		cmd.Stderr = c.logger.Writer()
 	}
 	c.Cmd = cmd
 }
@@ -249,10 +249,3 @@ func (c *Command) waitForTimeout() error {
 	log.Debugf("%s.run complete", c.Name)
 	return nil
 }
-
-// CloseLogs closes logs, duh
-func (c *Command) CloseLogs() {
-	if c.logger != nil {
-		c.logger.Close()
-	}
-}

coprocesses/coprocess.go

@@ -143,6 +143,5 @@ func (c *Coprocess) Stop() {
 	c.restart = false
 	if c.cmd != nil {
 		c.cmd.Kill()
-		c.cmd.CloseLogs()
 	}
 }

glide.yaml

@@ -3,7 +3,7 @@ homepage: https://www.joyent.com/containerpilot
 license: MPL-2.0
 import:
 - package: github.com/Sirupsen/logrus
-  version: ~0.9.0
+  version: 1.0.0
 - package: github.com/beorn7/perks
   version: b965b613227fddccbfffe13eae360ed3fa822f8d
   subpackages:

services/services.go

@@ -152,12 +152,8 @@ func (s *Service) PollAction() {
 	}
 }
 
-// PollStop closes the Service's logs
-func (s *Service) PollStop() {
-	if s.healthCheckCmd != nil {
-		s.healthCheckCmd.CloseLogs()
-	}
-}
+// PollStop is a no-op
+func (s *Service) PollStop() {}
 
 // SendHeartbeat sends a heartbeat for this service
 func (s *Service) SendHeartbeat() {

tasks/tasks.go

@@ -79,7 +79,6 @@ func (t *Task) PollStop() {
 	log.Debugf("task[%s].PollStop", t.Name)
 	if t.cmd != nil {
 		t.cmd.Kill()
-		t.cmd.CloseLogs()
 	}
 }
 

telemetry/sensors.go

@@ -41,12 +41,8 @@ func (s *Sensor) PollAction() {
 	}
 }
 
-// PollStop closes the Sensor's logs
-func (s *Sensor) PollStop() {
-	if s.checkCmd != nil {
-		s.checkCmd.CloseLogs()
-	}
-}
+// PollStop is a no-op
+func (s *Sensor) PollStop() {}
 
 // wrapping this func call makes it easier to test
 func (s *Sensor) observe() (string, error) {